@willieee802/zigbee-herdsman 0.36.0 → 0.48.2

package/dist/adapter/ember/ezsp/ezsp.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ezsp = exports.EzspEvents = void 0;
 /* istanbul ignore file */
-const debug_1 = __importDefault(require("debug"));
 const events_1 = __importDefault(require("events"));
-const cluster_1 = __importDefault(require("../../../zcl/definition/cluster"));
+const cluster_1 = require("../../../zspec/zcl/definition/cluster");
 const math_1 = require("../utils/math");
 const enums_1 = require("../enums");
 const zdo_1 = require("../zdo");
@@ -17,7 +16,8 @@ const ash_1 = require("../uart/ash");
 const buffalo_1 = require("./buffalo");
 const consts_2 = require("../consts");
 const endpoints_1 = require("../adapter/endpoints");
-const debug = (0, debug_1.default)('zigbee-herdsman:adapter:ember:ezsp');
+const logger_1 = require("../../../utils/logger");
+const NS = 'zh:ember:ezsp';
 /** no multi-network atm, so just use const */
 const DEFAULT_NETWORK_INDEX = endpoints_1.FIXED_ENDPOINTS[0].networkIndex;
 /** other values not supported atm */
@@ -110,8 +110,7 @@ class Ezsp extends events_1.default {
         this.frameContents = Buffer.alloc(consts_1.EZSP_MAX_FRAME_LENGTH);
         this.buffalo = new buffalo_1.EzspBuffalo(this.frameContents);
         this.ash = new ash_1.UartAsh(options);
-        this.ash.on(ash_1.AshEvents.rxError, this.onAshRxError.bind(this));
-        this.ash.on(ash_1.AshEvents.frame, this.onAshFrame.bind(this));
+        this.ash.on(ash_1.AshEvents.FRAME, this.onAshFrame.bind(this));
     }
     /**
      * Returns the number of EZSP responses that have been received by the serial
@@ -129,7 +128,11 @@ class Ezsp extends events_1.default {
         return `[FRAME: ID=${id}:"${enums_2.EzspFrameID[id]}" Seq=${this.frameContents[consts_1.EZSP_SEQUENCE_INDEX]} Len=${this.frameLength}]`;
     }
     initVariables() {
-        clearInterval(this.tickHandle);
+        if (this.waitingForResponse) {
+            clearTimeout(this.responseWaiter.timer);
+        }
+        clearTimeout(this.tickHandle);
+        this.ash.removeAllListeners(ash_1.AshEvents.FATAL_ERROR);
         this.frameContents.fill(0);
         this.frameLength = 0;
         this.buffalo.setPosition(0);
@@ -143,7 +146,7 @@ class Ezsp extends events_1.default {
         this.tickHandle = null;
     }
     async start() {
-        console.log(`======== EZSP starting ========`);
+        logger_1.logger.info(`======== EZSP starting ========`, NS);
         this.initVariables();
         let status;
         for (let i = 0; i < MAX_INIT_ATTEMPTS; i++) {
@@ -154,8 +157,10 @@ class Ezsp extends events_1.default {
             }
             status = await this.ash.start();
             if (status === enums_1.EzspStatus.SUCCESS) {
-                console.log(`======== EZSP started ========`);
-                this.registerHandlers();
+                logger_1.logger.info(`======== EZSP started ========`, NS);
+                // registered after reset sequence to avoid bubbling up to adapter before this point
+                this.ash.on(ash_1.AshEvents.FATAL_ERROR, this.onAshFatalError.bind(this));
+                this.tick();
                 return status;
             }
         }
@@ -167,12 +172,8 @@ class Ezsp extends events_1.default {
      */
     async stop() {
         await this.ash.stop();
-        if (this.waitingForResponse) {
-            clearTimeout(this.responseWaiter.timer);
-        }
-        clearInterval(this.tickHandle);
         this.initVariables();
-        console.log(`======== EZSP stopped ========`);
+        logger_1.logger.info(`======== EZSP stopped ========`, NS);
     }
     /**
      * Check if connected.
@@ -183,8 +184,8 @@ class Ezsp extends events_1.default {
     checkConnection() {
         return this.ash.connected;
     }
-    onAshRxError(status) {
-        this.ezspErrorHandler(status);
+    onAshFatalError(status) {
+        this.emit(EzspEvents.ncpNeedsResetAndInit, status);
     }
     onAshFrame() {
         // let tick handle if not waiting for response (CBs)
@@ -208,14 +209,13 @@ class Ezsp extends events_1.default {
         const lastFrameStr = `Last: ${this.frameToString}.`;
         if (status === enums_1.EzspStatus.ERROR_QUEUE_FULL) {
             this.counterErrQueueFull += 1;
-            console.error(`NCP Queue full (counter: ${this.counterErrQueueFull}). ${lastFrameStr}`);
+            logger_1.logger.error(`NCP Queue full (counter: ${this.counterErrQueueFull}). ${lastFrameStr}`, NS);
         }
         else if (status === enums_1.EzspStatus.ERROR_OVERFLOW) {
-            console.error(`The NCP has run out of buffers, causing general malfunction. Remediate network congestion, if present. `
-                + lastFrameStr);
+            logger_1.logger.error(`The NCP has run out of buffers, causing general malfunction. Remediate network congestion, if present. ${lastFrameStr}`, NS);
         }
         else {
-            console.error(`ERROR Transaction failure; status=${enums_1.EzspStatus[status]}. ${lastFrameStr}`);
+            logger_1.logger.error(`ERROR Transaction failure; status=${enums_1.EzspStatus[status]}. ${lastFrameStr}`, NS);
         }
         // Do not reset if this is a decryption failure, as we ignored the packet
         // Do not reset for a callback overflow or error queue, as we don't want the device to reboot under stress;
@@ -227,31 +227,25 @@ class Ezsp extends events_1.default {
             this.emit(EzspEvents.ncpNeedsResetAndInit, status);
         }
     }
-    registerHandlers() {
-        this.tickHandle = setInterval(this.tick.bind(this), this.tickInterval);
-    }
     /**
      * The Host application must call this function periodically to allow the EZSP layer to handle asynchronous events.
      */
     tick() {
-        if (this.sendingCommand) {
-            // don't process any callbacks while expecting a command's response
-            return;
-        }
+        // don't process any callbacks while sending a command and waiting for its response
         // nothing in the rx queue, nothing to receive
-        if (this.ash.rxQueue.empty) {
-            return;
-        }
-        if (this.responseReceived() === enums_1.EzspStatus.SUCCESS) {
-            this.callbackDispatch();
+        if (!this.sendingCommand && !this.ash.rxQueue.empty) {
+            if (this.responseReceived() === enums_1.EzspStatus.SUCCESS) {
+                this.callbackDispatch();
+            }
         }
+        this.tickHandle = setTimeout(this.tick.bind(this), this.tickInterval);
     }
     nextFrameSequence() {
         return (this.frameSequence = ((++this.frameSequence) & 0xFF));
     }
     startCommand(command) {
         if (this.sendingCommand) {
-            console.error(`[SEND COMMAND] Cannot send second one before processing response from first one.`);
+            logger_1.logger.error(`[SEND COMMAND] Cannot send second one before processing response from first one.`, NS);
             throw new Error(enums_1.EzspStatus[enums_1.EzspStatus.ERROR_INVALID_CALL]);
         }
         this.sendingCommand = true;
@@ -295,7 +289,7 @@ class Ezsp extends events_1.default {
      */
     async sendCommand() {
         if (!this.checkConnection()) {
-            debug("[SEND COMMAND] NOT CONNECTED");
+            logger_1.logger.debug(`[SEND COMMAND] NOT CONNECTED`, NS);
             return enums_1.EzspStatus.NOT_CONNECTED;
         }
         this.buffalo.setCommandByte(consts_1.EZSP_SEQUENCE_INDEX, this.nextFrameSequence());
@@ -319,7 +313,7 @@ class Ezsp extends events_1.default {
         }
         this.frameLength = length;
         let status;
-        debug(`===> ${this.frameToString}`);
+        logger_1.logger.debug(`===> ${this.frameToString}`, NS);
         try {
             status = await (new Promise((resolve, reject) => {
                 const sendStatus = (this.ash.send(this.frameLength, this.frameContents));
@@ -343,7 +337,7 @@ class Ezsp extends events_1.default {
             }
         }
         catch (err) {
-            debug(`=x=> ${this.frameToString} Error: ${err}`);
+            logger_1.logger.debug(`=x=> ${this.frameToString} Error: ${err}`, NS);
             this.ezspErrorHandler(status);
         }
         this.sendingCommand = false;
@@ -366,7 +360,7 @@ class Ezsp extends events_1.default {
             // While we are waiting for a response to a command, we use the asynch callback flag to ignore asynchronous callbacks.
             // This allows our caller to assume that no callbacks will appear between sending a command and receiving its response.
             if (this.waitingForResponse && (buffer.data[consts_1.EZSP_FRAME_CONTROL_INDEX] & consts_1.EZSP_FRAME_CONTROL_ASYNCH_CB)) {
-                debug(`Skipping async callback while waiting for response to command.`);
+                logger_1.logger.debug(`Skipping async callback while waiting for response to command.`, NS);
                 if (this.ash.rxFree.length === 0) {
                     dropBuffer = buffer;
                 }
@@ -376,7 +370,7 @@ class Ezsp extends events_1.default {
                 this.ash.rxQueue.removeEntry(buffer);
                 buffer.data.copy(this.frameContents, 0, 0, buffer.len); // take only what len tells us is actual content
                 this.frameLength = buffer.len;
-                debug(`<=== ${this.frameToString}`); // raw=${this.frameContents.subarray(0, this.frameLength).toString('hex')}`);
+                logger_1.logger.debug(`<=== ${this.frameToString}`, NS);
                 this.ash.rxFree.freeBuffer(buffer);
                 buffer = null;
                 status = enums_1.EzspStatus.SUCCESS;
@@ -386,7 +380,7 @@ class Ezsp extends events_1.default {
         if (dropBuffer != null) {
             this.ash.rxQueue.removeEntry(dropBuffer);
             this.ash.rxFree.freeBuffer(dropBuffer);
-            debug(`ERROR Host receive queue full. Dropping received callback: ${dropBuffer.data.toString('hex')}`);
+            logger_1.logger.debug(`ERROR Host receive queue full. Dropping received callback: ${dropBuffer.data.toString('hex')}`, NS);
             this.ezspErrorHandler(enums_1.EzspStatus.ERROR_QUEUE_FULL);
         }
         return status;
@@ -427,7 +421,7 @@ class Ezsp extends events_1.default {
             //this.callbackNetworkIndex = (frameControl & EZSP_FRAME_CONTROL_NETWORK_INDEX_MASK) >> EZSP_FRAME_CONTROL_NETWORK_INDEX_OFFSET;
         }
         if (status !== enums_1.EzspStatus.SUCCESS) {
-            debug(`[RESPONSE RECEIVED] ERROR ${enums_1.EzspStatus[status]}`);
+            logger_1.logger.debug(`[RESPONSE RECEIVED] ERROR ${enums_1.EzspStatus[status]}`, NS);
             this.ezspErrorHandler(status);
         }
         this.buffalo.setPosition(parametersIndex);
@@ -465,7 +459,7 @@ class Ezsp extends events_1.default {
             }
             case enums_2.EzspFrameID.CUSTOM_FRAME_HANDLER: {
                 const payloadLength = this.buffalo.readUInt8();
-                const payload = this.buffalo.readListUInt8({ length: payloadLength });
+                const payload = this.buffalo.readListUInt8(payloadLength);
                 this.ezspCustomFrameHandler(payloadLength, payload);
                 break;
             }
@@ -476,14 +470,14 @@ class Ezsp extends events_1.default {
             }
             case enums_2.EzspFrameID.ENERGY_SCAN_RESULT_HANDLER: {
                 const channel = this.buffalo.readUInt8();
-                const maxRssiValue = this.buffalo.readUInt8();
+                const maxRssiValue = this.buffalo.readInt8();
                 this.ezspEnergyScanResultHandler(channel, maxRssiValue);
                 break;
             }
             case enums_2.EzspFrameID.NETWORK_FOUND_HANDLER: {
                 const networkFound = this.buffalo.readEmberZigbeeNetwork();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 this.ezspNetworkFoundHandler(networkFound, lastHopLqi, lastHopRssi);
                 break;
             }
@@ -560,7 +554,7 @@ class Ezsp extends events_1.default {
                 const type = this.buffalo.readUInt8();
                 const apsFrame = this.buffalo.readEmberApsFrame();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 const sender = this.buffalo.readUInt16();
                 const bindingIndex = this.buffalo.readUInt8();
                 const addressIndex = this.buffalo.readUInt8();
@@ -591,9 +585,9 @@ class Ezsp extends events_1.default {
                 const source = this.buffalo.readUInt16();
                 const sourceEui = this.buffalo.readIeeeAddr();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 const relayCount = this.buffalo.readUInt8();
-                const relayList = this.buffalo.readListUInt16({ length: relayCount }); //this.buffalo.readListUInt8({length: (relayCount * 2)});
+                const relayList = this.buffalo.readListUInt16(relayCount); //this.buffalo.readListUInt8(relayCount * 2);
                 this.ezspIncomingRouteRecordHandler(source, sourceEui, lastHopLqi, lastHopRssi, relayCount, relayList);
                 break;
             }
@@ -605,7 +599,7 @@ class Ezsp extends events_1.default {
             case enums_2.EzspFrameID.MAC_PASSTHROUGH_MESSAGE_HANDLER: {
                 const messageType = this.buffalo.readUInt8();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 const messageContents = this.buffalo.readPayload();
                 this.ezspMacPassthroughMessageHandler(messageType, lastHopLqi, lastHopRssi, messageContents);
                 break;
@@ -614,7 +608,7 @@ class Ezsp extends events_1.default {
                 const filterIndexMatch = this.buffalo.readUInt8();
                 const legacyPassthroughType = this.buffalo.readUInt8();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 const messageContents = this.buffalo.readPayload();
                 this.ezspMacFilterMatchMessageHandler(filterIndexMatch, legacyPassthroughType, lastHopLqi, lastHopRssi, messageContents);
                 break;
@@ -683,16 +677,16 @@ class Ezsp extends events_1.default {
             }
             case enums_2.EzspFrameID.MFGLIB_RX_HANDLER: {
                 const linkQuality = this.buffalo.readUInt8();
-                const rssi = this.buffalo.readUInt8();
+                const rssi = this.buffalo.readInt8();
                 const packetLength = this.buffalo.readUInt8();
-                const packetContents = this.buffalo.readListUInt8({ length: packetLength });
+                const packetContents = this.buffalo.readListUInt8(packetLength);
                 this.ezspMfglibRxHandler(linkQuality, rssi, packetLength, packetContents);
                 break;
             }
             case enums_2.EzspFrameID.INCOMING_BOOTLOAD_MESSAGE_HANDLER: {
                 const longId = this.buffalo.readIeeeAddr();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 const messageContents = this.buffalo.readPayload();
                 this.ezspIncomingBootloadMessageHandler(longId, lastHopLqi, lastHopRssi, messageContents);
                 break;
@@ -708,7 +702,7 @@ class Ezsp extends events_1.default {
                 const isDeviceInfoNull = this.buffalo.readUInt8() === 1 ? true : false;
                 const deviceInfo = this.buffalo.readEmberZllDeviceInfoRecord();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 this.ezspZllNetworkFoundHandler(networkInfo, isDeviceInfoNull, deviceInfo, lastHopLqi, lastHopRssi);
                 break;
             }
@@ -720,7 +714,7 @@ class Ezsp extends events_1.default {
             case enums_2.EzspFrameID.ZLL_ADDRESS_ASSIGNMENT_HANDLER: {
                 const addressInfo = this.buffalo.readEmberZllAddressAssignment();
                 const lastHopLqi = this.buffalo.readUInt8();
-                const lastHopRssi = this.buffalo.readUInt8();
+                const lastHopRssi = this.buffalo.readInt8();
                 this.ezspZllAddressAssignmentHandler(addressInfo, lastHopLqi, lastHopRssi);
                 break;
             }
@@ -813,7 +807,7 @@ class Ezsp extends events_1.default {
         }
         apsFrame.sequence = apsSequence;
         // NOTE: match `~~~>` from adapter since this is just a wrapper for it
-        debug(`~~~> [SENT type=${enums_1.EmberOutgoingMessageType[type]} apsSequence=${apsSequence} messageTag=${messageTag} status=${enums_1.EmberStatus[status]}]`);
+        logger_1.logger.debug(`~~~> [SENT type=${enums_1.EmberOutgoingMessageType[type]} apsSequence=${apsSequence} messageTag=${messageTag} status=${enums_1.EmberStatus[status]}]`, NS);
         return [status, messageTag];
     }
     /**
@@ -1040,7 +1034,7 @@ class Ezsp extends events_1.default {
         if (readLength > maxReadLength) {
             throw enums_1.EzspStatus.ERROR_INVALID_VALUE;
         }
-        const data = this.buffalo.readListUInt8({ length: readLength });
+        const data = this.buffalo.readListUInt8(readLength);
         return [status, dataType, readLength, data];
     }
     /**
@@ -1188,7 +1182,7 @@ class Ezsp extends events_1.default {
         if (valueLength > maxValueLength) {
             throw enums_1.EzspStatus.ERROR_INVALID_VALUE;
         }
-        const value = this.buffalo.readListUInt8({ length: valueLength });
+        const value = this.buffalo.readListUInt8(valueLength);
         return [status, valueLength, value];
     }
     /**
@@ -1220,7 +1214,7 @@ class Ezsp extends events_1.default {
         if (valueLength > maxValueLength) {
             throw enums_1.EzspStatus.ERROR_INVALID_VALUE;
         }
-        const value = this.buffalo.readListUInt8({ length: valueLength });
+        const value = this.buffalo.readListUInt8(valueLength);
         return [status, valueLength, value];
     }
     /**
@@ -1315,7 +1309,7 @@ class Ezsp extends events_1.default {
      * Indicates that there are currently no pending callbacks.
      */
     ezspNoCallbacks() {
-        debug(`ezspNoCallbacks(): callback called`);
+        logger_1.logger.debug(`ezspNoCallbacks(): callback called`, NS);
     }
     /**
      * Sets a token (8 bytes of non-volatile storage) in the Simulated EEPROM of the NCP.
@@ -1349,7 +1343,7 @@ class Ezsp extends events_1.default {
             throw new Error(enums_1.EzspStatus[sendStatus]);
         }
         const status = this.buffalo.readUInt8();
-        const tokenData = this.buffalo.readListUInt8({ length: 8 });
+        const tokenData = this.buffalo.readListUInt8(8);
         return [status, tokenData];
     }
     /**
@@ -1407,7 +1401,7 @@ class Ezsp extends events_1.default {
         if (tokenDataLength != expectedTokenDataLength) {
             throw enums_1.EzspStatus.ERROR_INVALID_VALUE;
         }
-        const tokenData = this.buffalo.readListUInt8({ length: tokenDataLength });
+        const tokenData = this.buffalo.readListUInt8(tokenDataLength);
         return [tokenDataLength, tokenData];
     }
     /**
@@ -1436,7 +1430,7 @@ class Ezsp extends events_1.default {
      * @param tokenAddress uint16_t The address of the stack token that has changed.
      */
     ezspStackTokenChangedHandler(tokenAddress) {
-        debug(`ezspStackTokenChangedHandler(): callback called with: [tokenAddress=${tokenAddress}]`);
+        logger_1.logger.debug(`ezspStackTokenChangedHandler(): callback called with: [tokenAddress=${tokenAddress}]`, NS);
     }
     /**
      * Returns a pseudorandom number.
@@ -1506,7 +1500,7 @@ class Ezsp extends events_1.default {
      * @param timerId uint8_t Which timer generated the callback (0 or 1).
      */
     ezspTimerHandler(timerId) {
-        debug(`ezspTimerHandler(): callback called with: [timerId=${timerId}]`);
+        logger_1.logger.debug(`ezspTimerHandler(): callback called with: [timerId=${timerId}]`, NS);
     }
     /**
      * Sends a debug message from the Host to the Network Analyzer utility via the NCP.
@@ -1535,7 +1529,7 @@ class Ezsp extends events_1.default {
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
         }
-        const values = this.buffalo.readListUInt16({ length: enums_1.EmberCounterType.COUNT });
+        const values = this.buffalo.readListUInt16(enums_1.EmberCounterType.COUNT);
         return values;
     }
     /**
@@ -1548,7 +1542,7 @@ class Ezsp extends events_1.default {
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
         }
-        const values = this.buffalo.readListUInt16({ length: enums_1.EmberCounterType.COUNT });
+        const values = this.buffalo.readListUInt16(enums_1.EmberCounterType.COUNT);
         return values;
     }
     /**
@@ -1557,7 +1551,8 @@ class Ezsp extends events_1.default {
      * @param type Type of Counter
      */
     ezspCounterRolloverHandler(type) {
-        debug(`ezspCounterRolloverHandler(): callback called with: [type=${enums_1.EmberCounterType[type]}]`);
+        logger_1.logger.debug(`ezspCounterRolloverHandler(): callback called with: [type=${enums_1.EmberCounterType[type]}]`, NS);
+        logger_1.logger.info(`NCP Counter ${enums_1.EmberCounterType[type]} rolled over.`, NS);
     }
     /**
      * Used to test that UART flow control is working correctly.
@@ -1639,7 +1634,7 @@ class Ezsp extends events_1.default {
      * @param payload uint8_t * The payload of the custom frame.
      */
     ezspCustomFrameHandler(payloadLength, payload) {
-        debug(`ezspCustomFrameHandler(): callback called with: [payloadLength=${payloadLength}], [payload=${payload}]`);
+        logger_1.logger.debug(`ezspCustomFrameHandler(): callback called with: [payloadLength=${payloadLength}], [payload=${payload}]`, NS);
     }
     /**
      * Returns the EUI64 ID of the local node.
@@ -1767,7 +1762,7 @@ class Ezsp extends events_1.default {
      * @param status Stack status
      */
     ezspStackStatusHandler(status) {
-        debug(`ezspStackStatusHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`);
+        logger_1.logger.debug(`ezspStackStatusHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`, NS);
         this.emit(EzspEvents.STACK_STATUS, status);
     }
     /**
@@ -1809,8 +1804,8 @@ class Ezsp extends events_1.default {
      * @param maxRssiValue int8_t The maximum RSSI value found on the channel.
      */
     ezspEnergyScanResultHandler(channel, maxRssiValue) {
-        debug(`ezspEnergyScanResultHandler(): callback called with: [channel=${channel}], [maxRssiValue=${maxRssiValue}]`);
-        console.log(`Energy scan for channel ${channel} reports max RSSI value at ${maxRssiValue}.`);
+        logger_1.logger.debug(`ezspEnergyScanResultHandler(): callback called with: [channel=${channel}], [maxRssiValue=${maxRssiValue}]`, NS);
+        logger_1.logger.info(`Energy scan for channel ${channel} reports max RSSI value at ${maxRssiValue} dBm.`, NS);
     }
     /**
      * Callback
@@ -1821,8 +1816,8 @@ class Ezsp extends events_1.default {
      * @param lastHopRssi int8_t The energy level (in units of dBm) observed during the reception.
      */
     ezspNetworkFoundHandler(networkFound, lastHopLqi, lastHopRssi) {
-        debug(`ezspNetworkFoundHandler(): callback called with: [networkFound=${networkFound}], `
-            + `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}]`);
+        logger_1.logger.debug(`ezspNetworkFoundHandler(): callback called with: [networkFound=${JSON.stringify(networkFound)}], `
+            + `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}]`, NS);
     }
     /**
      * Callback
@@ -1833,7 +1828,7 @@ class Ezsp extends events_1.default {
      * error conditions signify a failure to scan on the channel specified.
      */
     ezspScanCompleteHandler(channel, status) {
-        debug(`ezspScanCompleteHandler(): callback called with: [channel=${channel}], [status=${enums_1.EmberStatus[status]}]`);
+        logger_1.logger.debug(`ezspScanCompleteHandler(): callback called with: [channel=${channel}], [status=${enums_1.EmberStatus[status]}]`, NS);
     }
     /**
      * Callback
@@ -1843,7 +1838,7 @@ class Ezsp extends events_1.default {
      * @param channel uint8_t The channel that the unused panID was found on.
      */
     ezspUnusedPanIdFoundHandler(panId, channel) {
-        debug(`ezspUnusedPanIdFoundHandler(): callback called with: [panId=${panId}], [channel=${channel}]`);
+        logger_1.logger.debug(`ezspUnusedPanIdFoundHandler(): callback called with: [panId=${panId}], [channel=${channel}]`, NS);
     }
     /**
      * This function starts a series of scans which will return an available panId.
@@ -1933,7 +1928,7 @@ class Ezsp extends events_1.default {
         this.startCommand(enums_2.EzspFrameID.JOIN_NETWORK_DIRECTLY);
         this.buffalo.writeUInt8(localNodeType);
         this.buffalo.writeEmberBeaconData(beacon);
-        this.buffalo.writeUInt8(radioTxPower);
+        this.buffalo.writeInt8(radioTxPower);
         this.buffalo.writeUInt8(clearBeaconsAfterNetworkUp ? 1 : 0);
         const sendStatus = await this.sendCommand();
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
@@ -2014,8 +2009,8 @@ class Ezsp extends events_1.default {
      * @param childType The node type of the child.
      */
     ezspChildJoinHandler(index, joining, childId, childEui64, childType) {
-        debug(`ezspChildJoinHandler(): callback called with: [index=${index}], [joining=${joining}], `
-            + `[childId=${childId}], [childEui64=${childEui64}], [childType=${childType}]`);
+        logger_1.logger.debug(`ezspChildJoinHandler(): callback called with: [index=${index}], [joining=${joining}], `
+            + `[childId=${childId}], [childEui64=${childEui64}], [childType=${childType}]`, NS);
     }
     /**
      * Sends a ZDO energy scan request. This request may only be sent by the current
@@ -2340,7 +2335,7 @@ class Ezsp extends events_1.default {
      */
     async ezspSetRadioPower(power) {
         this.startCommand(enums_2.EzspFrameID.SET_RADIO_POWER);
-        this.buffalo.writeUInt8(power);
+        this.buffalo.writeInt8(power);
         const sendStatus = await this.sendCommand();
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
@@ -2460,7 +2455,7 @@ class Ezsp extends events_1.default {
         this.buffalo.writeUInt8(phyIndex);
         this.buffalo.writeUInt8(page);
         this.buffalo.writeUInt8(channel);
-        this.buffalo.writeUInt8(power);
+        this.buffalo.writeInt8(power);
         this.buffalo.writeUInt8(bitmask);
         const sendStatus = await this.sendCommand();
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
@@ -2500,7 +2495,7 @@ class Ezsp extends events_1.default {
     async ezspMultiPhySetRadioPower(phyIndex, power) {
         this.startCommand(enums_2.EzspFrameID.MULTI_PHY_SET_RADIO_POWER);
         this.buffalo.writeUInt8(phyIndex);
-        this.buffalo.writeUInt8(power);
+        this.buffalo.writeInt8(power);
         const sendStatus = await this.sendCommand();
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
@@ -2616,7 +2611,7 @@ class Ezsp extends events_1.default {
             throw new Error(enums_1.EzspStatus[sendStatus]);
         }
         const status = this.buffalo.readUInt8();
-        const arrayOfDeviceDutyCycles = this.buffalo.readListUInt8({ length: 134 });
+        const arrayOfDeviceDutyCycles = this.buffalo.readListUInt8(134);
         return [status, arrayOfDeviceDutyCycles];
     }
     /**
@@ -2630,8 +2625,8 @@ class Ezsp extends events_1.default {
      *        The first entry always be the local stack's nodeId, and thus the total aggregate duty cycle for the device.
     */
     ezspDutyCycleHandler(channelPage, channel, state, totalDevices, arrayOfDeviceDutyCycles) {
-        debug(`ezspDutyCycleHandler(): callback called with: [channelPage=${channelPage}], [channel=${channel}], `
-            + `[state=${state}], [totalDevices=${totalDevices}], [arrayOfDeviceDutyCycles=${arrayOfDeviceDutyCycles}]`);
+        logger_1.logger.debug(`ezspDutyCycleHandler(): callback called with: [channelPage=${channelPage}], [channel=${channel}], `
+            + `[state=${state}], [totalDevices=${totalDevices}], [arrayOfDeviceDutyCycles=${arrayOfDeviceDutyCycles}]`, NS);
     }
     /**
      * Returns the first beacon in the cache. Beacons are stored in cache after
@@ -2842,8 +2837,8 @@ class Ezsp extends events_1.default {
      * @param policyDecision EMBER_SUCCESS if the binding was added to the table and any other status if not.
      */
     ezspRemoteSetBindingHandler(entry, index, policyDecision) {
-        debug(`ezspRemoteSetBindingHandler(): callback called with: [entry=${entry}], [index=${index}], `
-            + `[policyDecision=${enums_1.EmberStatus[policyDecision]}]`);
+        logger_1.logger.debug(`ezspRemoteSetBindingHandler(): callback called with: [entry=${entry}], [index=${index}], `
+            + `[policyDecision=${enums_1.EmberStatus[policyDecision]}]`, NS);
     }
     /**
      * Callback
@@ -2855,7 +2850,7 @@ class Ezsp extends events_1.default {
      * @param policyDecision EMBER_SUCCESS if the binding was removed from the table and any other status if not.
      */
     ezspRemoteDeleteBindingHandler(index, policyDecision) {
-        debug(`ezspRemoteDeleteBindingHandler(): callback called with: [index=${index}], [policyDecision=${enums_1.EmberStatus[policyDecision]}]`);
+        logger_1.logger.debug(`ezspRemoteDeleteBindingHandler(): callback called with: [index=${index}], [policyDecision=${enums_1.EmberStatus[policyDecision]}]`, NS);
     }
     //-----------------------------------------------------------------------------
     // Messaging Frames
@@ -3096,9 +3091,9 @@ class Ezsp extends events_1.default {
      *        for the messageContentsInCallback policy is messageTagAndContentsInCallback.
      */
     ezspMessageSentHandler(type, indexOrDestination, apsFrame, messageTag, status, messageContents) {
-        debug(`ezspMessageSentHandler(): callback called with: [type=${enums_1.EmberOutgoingMessageType[type]}], [indexOrDestination=${indexOrDestination}], `
+        logger_1.logger.debug(`ezspMessageSentHandler(): callback called with: [type=${enums_1.EmberOutgoingMessageType[type]}], [indexOrDestination=${indexOrDestination}], `
             + `[apsFrame=${JSON.stringify(apsFrame)}], [messageTag=${messageTag}], [status=${enums_1.EmberStatus[status]}], `
-            + `[messageContents=${messageContents.toString('hex')}]`);
+            + `[messageContents=${messageContents.toString('hex')}]`, NS);
         if (status === enums_1.EmberStatus.DELIVERY_FAILED) {
             // no ACK was received from the destination
             this.emit(EzspEvents.MESSAGE_SENT_DELIVERY_FAILED, type, indexOrDestination, apsFrame, messageTag);
@@ -3185,7 +3180,7 @@ class Ezsp extends events_1.default {
      *   - EMBER_MAC_NO_ACK_RECEIVED - The poll message was sent but not acknowledged by the parent.
      */
     ezspPollCompleteHandler(status) {
-        debug(`ezspPollCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`);
+        logger_1.logger.debug(`ezspPollCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`, NS);
     }
     /**
      * Callback
@@ -3194,7 +3189,7 @@ class Ezsp extends events_1.default {
      * @param transmitExpected True if transmit is expected, false otherwise.
      */
     ezspPollHandler(childId, transmitExpected) {
-        debug(`ezspPollHandler(): callback called with:  [childId=${childId}], [transmitExpected=${transmitExpected}]`);
+        logger_1.logger.debug(`ezspPollHandler(): callback called with:  [childId=${childId}], [transmitExpected=${transmitExpected}]`, NS);
     }
     /**
      * Callback
@@ -3205,7 +3200,7 @@ class Ezsp extends events_1.default {
      * @param senderEui64 The EUI64 of the sender
      */
     ezspIncomingSenderEui64Handler(senderEui64) {
-        debug(`ezspIncomingSenderEui64Handler(): callback called with: [senderEui64=${senderEui64}]`);
+        logger_1.logger.debug(`ezspIncomingSenderEui64Handler(): callback called with: [senderEui64=${senderEui64}]`, NS);
     }
     /**
      * Callback
@@ -3222,17 +3217,16 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The incoming message.
      */
     ezspIncomingMessageHandler(type, apsFrame, lastHopLqi, lastHopRssi, sender, bindingIndex, addressIndex, messageContents) {
-        debug(`ezspIncomingMessageHandler(): callback called with: [type=${enums_1.EmberIncomingMessageType[type]}], [apsFrame=${JSON.stringify(apsFrame)}], `
+        logger_1.logger.debug(`ezspIncomingMessageHandler(): callback called with: [type=${enums_1.EmberIncomingMessageType[type]}], [apsFrame=${JSON.stringify(apsFrame)}], `
             + `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}], [sender=${sender}], [bindingIndex=${bindingIndex}], `
-            + `[addressIndex=${addressIndex}], [messageContents=${messageContents.toString('hex')}]`);
-        // from protocol\zigbee\app\util\zigbee-framework\zigbee-device-host.h
+            + `[addressIndex=${addressIndex}], [messageContents=${messageContents.toString('hex')}]`, NS);
         if (apsFrame.profileId === zdo_1.ZDO_PROFILE_ID) {
             const zdoBuffalo = new buffalo_1.EzspBuffalo(messageContents, zdo_1.ZDO_MESSAGE_OVERHEAD); // set pos to skip `transaction sequence number`
             switch (apsFrame.clusterId) {
                 case zdo_1.IEEE_ADDRESS_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO IEEE_ADDRESS_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO IEEE_ADDRESS_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3256,11 +3250,11 @@ class Ezsp extends events_1.default {
                         if (zdoBuffalo.isMore()) {
                             assocDevCount = zdoBuffalo.readUInt8();
                             startIndex = zdoBuffalo.readUInt8();
-                            assocDevList = zdoBuffalo.readListUInt16({ length: assocDevCount });
+                            assocDevList = zdoBuffalo.readListUInt16(assocDevCount);
                         }
-                        debug(`<=== [ZDO IEEE_ADDRESS_RESPONSE status=${status} eui64=${eui64} nodeId=${nodeId} startIndex=${startIndex} `
-                            + `assocDevList=${assocDevList}]`);
-                        debug(`<=== [ZDO IEEE_ADDRESS_RESPONSE] Support not implemented upstream`);
+                        logger_1.logger.debug(`<=== [ZDO IEEE_ADDRESS_RESPONSE status=${zdo_1.EmberZdoStatus[status]} eui64=${eui64} nodeId=${nodeId} `
+                            + `startIndex=${startIndex} assocDevList=${assocDevList}]`, NS);
+                        logger_1.logger.debug(`<=== [ZDO IEEE_ADDRESS_RESPONSE] Support not implemented upstream`, NS);
                         const payload = { eui64, nodeId, assocDevList };
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
                     }
@@ -3269,7 +3263,7 @@ class Ezsp extends events_1.default {
                 case zdo_1.NETWORK_ADDRESS_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO NETWORK_ADDRESS_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO NETWORK_ADDRESS_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3293,10 +3287,10 @@ class Ezsp extends events_1.default {
                         if (zdoBuffalo.isMore()) {
                             assocDevCount = zdoBuffalo.readUInt8();
                             startIndex = zdoBuffalo.readUInt8();
-                            assocDevList = zdoBuffalo.readListUInt16({ length: assocDevCount });
+                            assocDevList = zdoBuffalo.readListUInt16(assocDevCount);
                         }
-                        debug(`<=== [ZDO NETWORK_ADDRESS_RESPONSE status=${status} eui64=${eui64} nodeId=${nodeId} startIndex=${startIndex} `
-                            + `assocDevList=${assocDevList}]`);
+                        logger_1.logger.debug(`<=== [ZDO NETWORK_ADDRESS_RESPONSE status=${zdo_1.EmberZdoStatus[status]} eui64=${eui64} nodeId=${nodeId} `
+                            + `startIndex=${startIndex} assocDevList=${assocDevList}]`, NS);
                         const payload = { eui64, nodeId, assocDevList };
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
                     }
@@ -3305,15 +3299,15 @@ class Ezsp extends events_1.default {
                 case zdo_1.MATCH_DESCRIPTORS_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO MATCH_DESCRIPTORS_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO MATCH_DESCRIPTORS_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
                         const nodeId = zdoBuffalo.readUInt16();
                         const endpointCount = zdoBuffalo.readUInt8();
-                        const endpointList = zdoBuffalo.readListUInt8({ length: endpointCount });
-                        debug(`<=== [ZDO MATCH_DESCRIPTORS_RESPONSE status=${status} nodeId=${nodeId} endpointList=${endpointList}]`);
-                        debug(`<=== [ZDO MATCH_DESCRIPTORS_RESPONSE] Support not implemented upstream`);
+                        const endpointList = zdoBuffalo.readListUInt8(endpointCount);
+                        logger_1.logger.debug(`<=== [ZDO MATCH_DESCRIPTORS_RESPONSE status=${zdo_1.EmberZdoStatus[status]} nodeId=${nodeId} endpointList=${endpointList}]`, NS);
+                        logger_1.logger.debug(`<=== [ZDO MATCH_DESCRIPTORS_RESPONSE] Support not implemented upstream`, NS);
                         const payload = { nodeId, endpointList };
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
                     }
@@ -3322,7 +3316,7 @@ class Ezsp extends events_1.default {
                 case zdo_1.SIMPLE_DESCRIPTOR_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO SIMPLE_DESCRIPTOR_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO SIMPLE_DESCRIPTOR_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3335,11 +3329,12 @@ class Ezsp extends events_1.default {
                         // values 0000-1111, others reserved
                         const deviceVersion = zdoBuffalo.readUInt8();
                         const inClusterCount = zdoBuffalo.readUInt8();
-                        const inClusterList = zdoBuffalo.readListUInt16({ length: inClusterCount });
+                        const inClusterList = zdoBuffalo.readListUInt16(inClusterCount);
                         const outClusterCount = zdoBuffalo.readUInt8();
-                        const outClusterList = zdoBuffalo.readListUInt16({ length: outClusterCount });
-                        debug(`<=== [ZDO SIMPLE_DESCRIPTOR_RESPONSE status=${status} nodeId=${nodeId} endpoint=${endpoint} profileId=${profileId} `
-                            + `deviceId=${deviceId} deviceVersion=${deviceVersion} inClusterList=${inClusterList} outClusterList=${outClusterList}]`);
+                        const outClusterList = zdoBuffalo.readListUInt16(outClusterCount);
+                        logger_1.logger.debug(`<=== [ZDO SIMPLE_DESCRIPTOR_RESPONSE status=${zdo_1.EmberZdoStatus[status]} nodeId=${nodeId} endpoint=${endpoint} `
+                            + `profileId=${profileId} deviceId=${deviceId} deviceVersion=${deviceVersion} inClusterList=${inClusterList} `
+                            + `outClusterList=${outClusterList}]`, NS);
                         const payload = {
                             nodeId,
                             endpoint,
@@ -3355,7 +3350,7 @@ class Ezsp extends events_1.default {
                 case zdo_1.NODE_DESCRIPTOR_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO NODE_DESCRIPTOR_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO NODE_DESCRIPTOR_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3410,9 +3405,9 @@ class Ezsp extends events_1.default {
                         // in bits: [extended active endpoint list available: 1] [extended simple descriptor list available: 1] [reserved: 6]
                         // eslint-disable-next-line @typescript-eslint/no-unused-vars
                         const descCapFlags = zdoBuffalo.readUInt8();
-                        debug(`<=== [ZDO NODE_DESCRIPTOR_RESPONSE status=${status} nodeId=${nodeId} logicalType=${logicalType} `
+                        logger_1.logger.debug(`<=== [ZDO NODE_DESCRIPTOR_RESPONSE status=${zdo_1.EmberZdoStatus[status]} nodeId=${nodeId} logicalType=${logicalType} `
                             + `freqBand=${freqBand} macCapFlags=${(0, math_1.byteToBits)(macCapFlags)} manufacturerCode=${manufacturerCode} maxBufSize=${maxBufSize} `
-                            + `maxIncTxSize=${maxIncTxSize} stackRevision=${stackRevision} maxOutTxSize=${maxOutTxSize}]`);
+                            + `maxIncTxSize=${maxIncTxSize} stackRevision=${stackRevision} maxOutTxSize=${maxOutTxSize}]`, NS);
                         const payload = {
                             nodeId,
                             logicalType,
@@ -3427,7 +3422,7 @@ class Ezsp extends events_1.default {
                 case zdo_1.POWER_DESCRIPTOR_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO POWER_DESCRIPTOR_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO POWER_DESCRIPTOR_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3451,10 +3446,10 @@ class Ezsp extends events_1.default {
                         //        1100 == 100%
                         // All other values reserved
                         const [currentPowerSource, currentPowerSourceLevel] = (0, math_1.lowHighBits)(zdoBuffalo.readUInt8());
-                        debug(`<=== [ZDO POWER_DESCRIPTOR_RESPONSE status=${status} nodeId=${nodeId} currentPowerMode=${currentPowerMode} `
-                            + `availPowerSources=${availPowerSources} currentPowerSource=${currentPowerSource} `
-                            + `currentPowerSourceLevel=${currentPowerSourceLevel}]`);
-                        debug(`<=== [ZDO POWER_DESCRIPTOR_RESPONSE] Support not implemented upstream`);
+                        logger_1.logger.debug(`<=== [ZDO POWER_DESCRIPTOR_RESPONSE status=${zdo_1.EmberZdoStatus[status]} nodeId=${nodeId} `
+                            + `currentPowerMode=${currentPowerMode} availPowerSources=${availPowerSources} currentPowerSource=${currentPowerSource} `
+                            + `currentPowerSourceLevel=${currentPowerSourceLevel}]`, NS);
+                        logger_1.logger.debug(`<=== [ZDO POWER_DESCRIPTOR_RESPONSE] Support not implemented upstream`, NS);
                         const payload = {
                             nodeId,
                             currentPowerMode,
@@ -3469,14 +3464,14 @@ class Ezsp extends events_1.default {
                 case zdo_1.ACTIVE_ENDPOINTS_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO ACTIVE_ENDPOINTS_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO ACTIVE_ENDPOINTS_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
                         const nodeId = zdoBuffalo.readUInt16();
                         const endpointCount = zdoBuffalo.readUInt8();
-                        const endpointList = zdoBuffalo.readListUInt8({ length: endpointCount });
-                        debug(`<=== [ZDO ACTIVE_ENDPOINTS_RESPONSE status=${status} nodeId=${nodeId} endpointList=${endpointList}]`);
+                        const endpointList = zdoBuffalo.readListUInt8(endpointCount);
+                        logger_1.logger.debug(`<=== [ZDO ACTIVE_ENDPOINTS_RESPONSE status=${zdo_1.EmberZdoStatus[status]} nodeId=${nodeId} endpointList=${endpointList}]`, NS);
                         const payload = { nodeId, endpointList };
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
                     }
@@ -3485,7 +3480,7 @@ class Ezsp extends events_1.default {
                 case zdo_1.LQI_TABLE_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO LQI_TABLE_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO LQI_TABLE_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3499,7 +3494,7 @@ class Ezsp extends events_1.default {
                         // of the elements in the remote device's neighbor table, including the device address and assoc. LQI
                         const entryList = [];
                         for (let i = 0; i < entryCount; i++) {
-                            const extendedPanId = zdoBuffalo.readListUInt8({ length: consts_1.EXTENDED_PAN_ID_SIZE });
+                            const extendedPanId = zdoBuffalo.readListUInt8(consts_1.EXTENDED_PAN_ID_SIZE);
                             const eui64 = zdoBuffalo.readIeeeAddr();
                             const nodeId = zdoBuffalo.readUInt16();
                             const deviceTypeByte = zdoBuffalo.readUInt8();
@@ -3520,8 +3515,8 @@ class Ezsp extends events_1.default {
                                 lqi,
                             });
                         }
-                        debug(`<=== [ZDO LQI_TABLE_RESPONSE status=${status} neighborTableEntries=${neighborTableEntries} startIndex=${startIndex} `
-                            + `entryCount=${entryCount} entryList=${JSON.stringify(entryList)}]`);
+                        logger_1.logger.debug(`<=== [ZDO LQI_TABLE_RESPONSE status=${zdo_1.EmberZdoStatus[status]} neighborTableEntries=${neighborTableEntries} `
+                            + `startIndex=${startIndex} entryCount=${entryCount} entryList=${JSON.stringify(entryList)}]`, NS);
                         const payload = { neighborTableEntries, entryList };
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
                     }
@@ -3530,7 +3525,7 @@ class Ezsp extends events_1.default {
                 case zdo_1.ROUTING_TABLE_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO ROUTING_TABLE_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO ROUTING_TABLE_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3557,8 +3552,8 @@ class Ezsp extends events_1.default {
                                 nextHopAddress,
                             });
                         }
-                        debug(`<=== [ZDO ROUTING_TABLE_RESPONSE status=${status} routingTableEntries=${routingTableEntries} startIndex=${startIndex} `
-                            + `entryCount=${entryCount} entryList=${JSON.stringify(entryList)}]`);
+                        logger_1.logger.debug(`<=== [ZDO ROUTING_TABLE_RESPONSE status=${zdo_1.EmberZdoStatus[status]} routingTableEntries=${routingTableEntries} `
+                            + `startIndex=${startIndex} entryCount=${entryCount} entryList=${JSON.stringify(entryList)}]`, NS);
                         const payload = { routingTableEntries, entryList };
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
                     }
@@ -3567,7 +3562,7 @@ class Ezsp extends events_1.default {
                 case zdo_1.BINDING_TABLE_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
                     if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                        debug(`<=== [ZDO BINDING_TABLE_RESPONSE status=${status}]`);
+                        logger_1.logger.debug(`<=== [ZDO BINDING_TABLE_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
                     }
                     else {
@@ -3591,9 +3586,9 @@ class Ezsp extends events_1.default {
                                 destEndpoint,
                             });
                         }
-                        debug(`<=== [ZDO BINDING_TABLE_RESPONSE status=${status} bindingTableEntries=${bindingTableEntries} startIndex=${startIndex} `
-                            + `entryCount=${entryCount} entryList=${JSON.stringify(entryList)}]`);
-                        debug(`<=== [ZDO BINDING_TABLE_RESPONSE] Support not implemented upstream`);
+                        logger_1.logger.debug(`<=== [ZDO BINDING_TABLE_RESPONSE status=${zdo_1.EmberZdoStatus[status]} bindingTableEntries=${bindingTableEntries} `
+                            + `startIndex=${startIndex} entryCount=${entryCount} entryList=${JSON.stringify(entryList)}]`, NS);
+                        logger_1.logger.debug(`<=== [ZDO BINDING_TABLE_RESPONSE] Support not implemented upstream`, NS);
                         const payload = { bindingTableEntries, entryList };
                         this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
                     }
@@ -3601,25 +3596,25 @@ class Ezsp extends events_1.default {
                 }
                 case zdo_1.BIND_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
-                    debug(`<=== [ZDO BIND_RESPONSE status=${status}]`);
+                    logger_1.logger.debug(`<=== [ZDO BIND_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                     this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame);
                     break;
                 }
                 case zdo_1.UNBIND_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
-                    debug(`<=== [ZDO UNBIND_RESPONSE status=${status}]`);
+                    logger_1.logger.debug(`<=== [ZDO UNBIND_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                     this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame);
                     break;
                 }
                 case zdo_1.LEAVE_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
-                    debug(`<=== [ZDO LEAVE_RESPONSE status=${status}]`);
+                    logger_1.logger.debug(`<=== [ZDO LEAVE_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                     this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame);
                     break;
                 }
                 case zdo_1.PERMIT_JOINING_RESPONSE: {
                     const status = zdoBuffalo.readUInt8();
-                    debug(`<=== [ZDO PERMIT_JOINING_RESPONSE status=${status}]`);
+                    logger_1.logger.debug(`<=== [ZDO PERMIT_JOINING_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
                     this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame);
                     break;
                 }
@@ -3628,14 +3623,35 @@ class Ezsp extends events_1.default {
                     const eui64 = zdoBuffalo.readIeeeAddr();
                     /** @see MACCapabilityFlags */
                     const capabilities = zdoBuffalo.readUInt8();
-                    debug(`<=== [ZDO END_DEVICE_ANNOUNCE nodeId=${nodeId} eui64=${eui64} capabilities=${(0, math_1.byteToBits)(capabilities)}]`);
+                    logger_1.logger.debug(`<=== [ZDO END_DEVICE_ANNOUNCE nodeId=${nodeId} eui64=${eui64} capabilities=${(0, math_1.byteToBits)(capabilities)}]`, NS);
                     const payload = { nodeId, eui64, capabilities: (0, math_1.getMacCapFlags)(capabilities) };
                     // this one gets its own event since its purpose is to pass an event up to Z2M
                     this.emit(EzspEvents.END_DEVICE_ANNOUNCE, sender, apsFrame, payload);
                     break;
                 }
+                case zdo_1.PARENT_ANNOUNCE_RESPONSE: {
+                    const status = zdoBuffalo.readUInt8();
+                    if (status !== zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
+                        // status should always be NOT_SUPPORTED here
+                        logger_1.logger.debug(`<=== [ZDO PARENT_ANNOUNCE_RESPONSE status=${zdo_1.EmberZdoStatus[status]}]`, NS);
+                        this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, null);
+                    }
+                    else {
+                        const numberOfChildren = zdoBuffalo.readUInt8();
+                        const children = [];
+                        for (let i = 0; i < numberOfChildren; i++) {
+                            const childEui64 = zdoBuffalo.readIeeeAddr();
+                            children.push(childEui64);
+                        }
+                        logger_1.logger.debug(`<=== [ZDO PARENT_ANNOUNCE_RESPONSE status=${zdo_1.EmberZdoStatus[status]} numberOfChildren=${numberOfChildren} `
+                            + `children=${children}]`, NS);
+                        logger_1.logger.debug(`<=== [ZDO PARENT_ANNOUNCE_RESPONSE] Support not implemented upstream`, NS);
+                        const payload = { children };
+                        this.emit(EzspEvents.ZDO_RESPONSE, status, sender, apsFrame, payload);
+                    }
+                }
                 default: {
-                    console.log(`<=== [ZDO clusterId=${apsFrame.clusterId}] Support not implemented upstream.`);
+                    logger_1.logger.info(`<=== [ZDO clusterId=${apsFrame.clusterId} sender=${sender}] Support not implemented upstream.`, NS);
                     break;
                 }
             }
@@ -3671,7 +3687,7 @@ class Ezsp extends events_1.default {
      *        for this discovery arrive, but the callback is made only once.
      */
     ezspIncomingManyToOneRouteRequestHandler(source, longId, cost) {
-        debug(`ezspIncomingManyToOneRouteRequestHandler(): callback called with: [source=${source}], [longId=${longId}], [cost=${cost}]`);
+        logger_1.logger.debug(`ezspIncomingManyToOneRouteRequestHandler(): callback called with: [source=${source}], [longId=${longId}], [cost=${cost}]`, NS);
     }
     /**
      * Callback
@@ -3699,7 +3715,7 @@ class Ezsp extends events_1.default {
      * @param target The short id of the remote node.
      */
     ezspIncomingRouteErrorHandler(status, target) {
-        debug(`ezspIncomingRouteErrorHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [target=${target}]`);
+        logger_1.logger.debug(`ezspIncomingRouteErrorHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [target=${target}]`, NS);
         // NOTE: This can trigger immediately after removal of a device with status MAC_INDIRECT_TIMEOUT
     }
     /**
@@ -3716,8 +3732,8 @@ class Ezsp extends events_1.default {
      * @param target The short ID of the remote node
      */
     ezspIncomingNetworkStatusHandler(errorCode, target) {
-        debug(`ezspIncomingNetworkStatusHandler(): callback called with: [errorCode=${enums_1.EmberStackError[errorCode]}], [target=${target}]`);
-        console.log(`Received network/route error ${enums_1.EmberStackError[errorCode]} for "${target}".`);
+        logger_1.logger.debug(`ezspIncomingNetworkStatusHandler(): callback called with: [errorCode=${enums_1.EmberStackError[errorCode]}], [target=${target}]`, NS);
+        logger_1.logger.info(`Received network/route error ${enums_1.EmberStackError[errorCode]} for "${target}".`, NS);
     }
     /**
      * Callback
@@ -3731,8 +3747,8 @@ class Ezsp extends events_1.default {
      *        The list is passed as uint8_t * to avoid alignment problems.
      */
     ezspIncomingRouteRecordHandler(source, sourceEui, lastHopLqi, lastHopRssi, relayCount, relayList) {
-        debug(`ezspIncomingRouteRecordHandler(): callback called with: [source=${source}], [sourceEui=${sourceEui}], `
-            + `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}], [relayCount=${relayCount}], [relayList=${relayList}]`);
+        logger_1.logger.debug(`ezspIncomingRouteRecordHandler(): callback called with: [source=${source}], [sourceEui=${sourceEui}], `
+            + `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}], [relayCount=${relayCount}], [relayList=${relayList}]`, NS);
         // XXX: could at least trigger a `Events.lastSeenChanged` but this is not currently being listened to at the adapter level
     }
     /**
@@ -4030,8 +4046,12 @@ class Ezsp extends events_1.default {
      * @param id The short id for which a conflict was detected
      */
     ezspIdConflictHandler(id) {
-        debug(`ezspIdConflictHandler(): callback called with: [id=${id}]`);
-        console.warn(`An ID conflict was detected for device "${id}".`);
+        logger_1.logger.debug(`ezspIdConflictHandler(): callback called with: [id=${id}]`, NS);
+        logger_1.logger.warning(`An ID conflict was detected for network address "${id}". Corresponding devices kicked from the network.`, NS);
+        // XXX: this is currently causing more problems than not doing it, so disabled for now.
+        //      devices should rejoin on ID conflict anyway, so the database isn't out of sync for very long.
+        // hijacking the event from `ezspTrustCenterJoinHandler`, and forging a DEVICE_LEFT to avoid another event ending up doing the same logic
+        // this.emit(EzspEvents.TRUST_CENTER_JOIN, id, null, EmberDeviceUpdate.DEVICE_LEFT, EmberJoinDecision.NO_ACTION, NULL_NODE_ID);
     }
     /**
      * Write the current node Id, PAN ID, or Node type to the tokens
@@ -4095,8 +4115,8 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The raw message that was received.
      */
     ezspMacPassthroughMessageHandler(messageType, lastHopLqi, lastHopRssi, messageContents) {
-        debug(`ezspMacPassthroughMessageHandler(): callback called with: [messageType=${messageType}], [lastHopLqi=${lastHopLqi}], `
-            + `[lastHopRssi=${lastHopRssi}], [messageContents=${messageContents.toString('hex')}]`);
+        logger_1.logger.debug(`ezspMacPassthroughMessageHandler(): callback called with: [messageType=${messageType}], [lastHopLqi=${lastHopLqi}], `
+            + `[lastHopRssi=${lastHopRssi}], [messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * Callback
@@ -4110,9 +4130,9 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The raw message that was received.
      */
     ezspMacFilterMatchMessageHandler(filterIndexMatch, legacyPassthroughType, lastHopLqi, lastHopRssi, messageContents) {
-        debug(`ezspMacFilterMatchMessageHandler(): callback called with: [filterIndexMatch=${filterIndexMatch}], `
+        logger_1.logger.debug(`ezspMacFilterMatchMessageHandler(): callback called with: [filterIndexMatch=${filterIndexMatch}], `
             + `[legacyPassthroughType=${legacyPassthroughType}], [lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}], `
-            + `[messageContents=${messageContents.toString('hex')}]`);
+            + `[messageContents=${messageContents.toString('hex')}]`, NS);
         // TODO: needs triple-checking, this is only valid for InterPAN messages
         const msgBuffalo = new buffalo_1.EzspBuffalo(messageContents, 0);
         const macFrameControl = msgBuffalo.readUInt16() & ~(consts_2.MAC_ACK_REQUIRED);
@@ -4129,7 +4149,7 @@ class Ezsp extends events_1.default {
             destAddress = msgBuffalo.readUInt16();
         }
         else {
-            debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN macFrameControl "${macFrameControl}".`);
+            logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN macFrameControl "${macFrameControl}".`, NS);
             return;
         }
         const sourcePanId = msgBuffalo.readUInt16();
@@ -4137,19 +4157,19 @@ class Ezsp extends events_1.default {
         // Now that we know the correct MAC length, verify the interpan frame is the correct length.
         let remainingLength = msgBuffalo.getBufferLength() - msgBuffalo.getPosition();
         if (remainingLength < (consts_2.STUB_NWK_SIZE + consts_2.MIN_STUB_APS_SIZE)) {
-            debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN length "${remainingLength}".`);
+            logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN length "${remainingLength}".`, NS);
             return;
         }
         const nwkFrameControl = msgBuffalo.readUInt16();
         remainingLength -= 2; // read 2 more bytes before APS stuff
         if (nwkFrameControl !== consts_2.STUB_NWK_FRAME_CONTROL) {
-            debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN nwkFrameControl "${nwkFrameControl}".`);
+            logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN nwkFrameControl "${nwkFrameControl}".`, NS);
             return;
         }
         const apsFrameControl = msgBuffalo.readUInt8();
         if ((apsFrameControl & ~(consts_2.INTERPAN_APS_FRAME_DELIVERY_MODE_MASK) & ~(consts_2.INTERPAN_APS_FRAME_SECURITY))
             !== consts_2.INTERPAN_APS_FRAME_CONTROL_NO_DELIVERY_MODE) {
-            debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN apsFrameControl "${apsFrameControl}".`);
+            logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN apsFrameControl "${apsFrameControl}".`, NS);
             return;
         }
         const messageType = (apsFrameControl & consts_2.INTERPAN_APS_FRAME_DELIVERY_MODE_MASK);
@@ -4158,28 +4178,28 @@ class Ezsp extends events_1.default {
             case enums_1.EmberInterpanMessageType.UNICAST:
             case enums_1.EmberInterpanMessageType.BROADCAST: {
                 if (remainingLength < consts_2.INTERPAN_APS_UNICAST_BROADCAST_SIZE) {
-                    debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN length "${remainingLength}".`);
+                    logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN length "${remainingLength}".`, NS);
                     return;
                 }
                 break;
             }
             case enums_1.EmberInterpanMessageType.MULTICAST: {
                 if (remainingLength < consts_2.INTERPAN_APS_MULTICAST_SIZE) {
-                    debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN length "${remainingLength}".`);
+                    logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN length "${remainingLength}".`, NS);
                     return;
                 }
                 groupId = msgBuffalo.readUInt16();
                 break;
             }
             default: {
-                debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN messageType "${messageType}".`);
+                logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN messageType "${messageType}".`, NS);
                 return;
             }
         }
         const clusterId = msgBuffalo.readUInt16();
         const profileId = msgBuffalo.readUInt16();
         const payload = msgBuffalo.readRest();
-        if (profileId === consts_2.TOUCHLINK_PROFILE_ID && clusterId === cluster_1.default.touchlink.ID) {
+        if (profileId === consts_2.TOUCHLINK_PROFILE_ID && clusterId === cluster_1.Clusters.touchlink.ID) {
             this.emit(EzspEvents.TOUCHLINK_MESSAGE, sourcePanId, sourceAddress, groupId, lastHopLqi, payload);
         }
     }
@@ -4190,7 +4210,7 @@ class Ezsp extends events_1.default {
      * @param status EMBER_SUCCESS if the transmission was successful, or EMBER_DELIVERY_FAILED if not
      */
     ezspRawTransmitCompleteHandler(status) {
-        debug(`ezspRawTransmitCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`);
+        logger_1.logger.debug(`ezspRawTransmitCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`, NS);
     }
     /**
      * This function is useful to sleepy end devices. This function will set the
@@ -4323,7 +4343,7 @@ class Ezsp extends events_1.default {
          */
         // NOTE: added for good measure
         if (context.coreKeyType === enums_1.SecManKeyType.INTERNAL) {
-            console.assert(false, `ezspImportKey cannot use INTERNAL key type.`);
+            logger_1.logger.error(`ezspImportKey cannot use INTERNAL key type.`, NS);
             return [null, enums_1.SLStatus.INVALID_PARAMETER];
         }
         this.startCommand(enums_2.EzspFrameID.EXPORT_KEY);
@@ -4382,7 +4402,7 @@ class Ezsp extends events_1.default {
          */
         // NOTE: added for good measure
         if (context.coreKeyType === enums_1.SecManKeyType.INTERNAL) {
-            console.assert(false, `ezspImportKey cannot use INTERNAL key type.`);
+            logger_1.logger.error(`ezspImportKey cannot use INTERNAL key type.`, NS);
             return enums_1.SLStatus.INVALID_PARAMETER;
         }
         this.startCommand(enums_2.EzspFrameID.IMPORT_KEY);
@@ -4403,7 +4423,7 @@ class Ezsp extends events_1.default {
      * @param sequenceNumber uint8_t The sequence number of the new network key.
      */
     ezspSwitchNetworkKeyHandler(sequenceNumber) {
-        debug(`ezspSwitchNetworkKeyHandler(): callback called with: [sequenceNumber=${sequenceNumber}]`);
+        logger_1.logger.debug(`ezspSwitchNetworkKeyHandler(): callback called with: [sequenceNumber=${sequenceNumber}]`, NS);
     }
     /**
      * This function searches through the Key Table and tries to find the entry that
@@ -4534,7 +4554,7 @@ class Ezsp extends events_1.default {
      * @param status This is the status indicating what was established or why the key establishment failed.
      */
     ezspZigbeeKeyEstablishmentHandler(partner, status) {
-        debug(`ezspZigbeeKeyEstablishmentHandler(): callback called with: [partner=${partner}], [status=${enums_1.EmberKeyStatus[status]}]`);
+        logger_1.logger.debug(`ezspZigbeeKeyEstablishmentHandler(): callback called with: [partner=${partner}], [status=${enums_1.EmberKeyStatus[status]}]`, NS);
         // NOTE: For security reasons, any valid `partner` (not wildcard) that return with a status=TC_REQUESTER_VERIFY_KEY_TIMEOUT
         //       are kicked off the network for posing a risk, unless HA devices allowed (as opposed to Z3)
         //       and always if status=TC_REQUESTER_VERIFY_KEY_FAILURE
@@ -4862,9 +4882,9 @@ class Ezsp extends events_1.default {
      * @param parentOfNewNodeId The parent of the node whose status has changed.
      */
     ezspTrustCenterJoinHandler(newNodeId, newNodeEui64, status, policyDecision, parentOfNewNodeId) {
-        debug(`ezspTrustCenterJoinHandler(): callback called with: [newNodeId=${newNodeId}], [newNodeEui64=${newNodeEui64}], `
+        logger_1.logger.debug(`ezspTrustCenterJoinHandler(): callback called with: [newNodeId=${newNodeId}], [newNodeEui64=${newNodeEui64}], `
             + `[status=${enums_1.EmberDeviceUpdate[status]}], [policyDecision=${enums_1.EmberJoinDecision[policyDecision]}], `
-            + `[parentOfNewNodeId=${parentOfNewNodeId}]`);
+            + `[parentOfNewNodeId=${parentOfNewNodeId}]`, NS);
         // NOTE: this is mostly just passing stuff up to Z2M, so use only one emit for all, let adapter do the rest, no parsing needed
         this.emit(EzspEvents.TRUST_CENTER_JOIN, newNodeId, newNodeEui64, status, policyDecision, parentOfNewNodeId);
     }
@@ -4997,7 +5017,7 @@ class Ezsp extends events_1.default {
      * @param ephemeralPublicKey EmberPublicKeyData * The generated ephemeral public key.
      */
     ezspGenerateCbkeKeysHandler(status, ephemeralPublicKey) {
-        debug(`ezspGenerateCbkeKeysHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [ephemeralPublicKey=${ephemeralPublicKey}]`);
+        logger_1.logger.debug(`ezspGenerateCbkeKeysHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [ephemeralPublicKey=${ephemeralPublicKey}]`, NS);
     }
     /**
      * Calculates the SMAC verification keys for both the initiator and responder
@@ -5032,8 +5052,8 @@ class Ezsp extends events_1.default {
      * @param responderSmac EmberSmacData * The calculated value of the responder's SMAC
      */
     ezspCalculateSmacsHandler(status, initiatorSmac, responderSmac) {
-        debug(`ezspCalculateSmacsHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [initiatorSmac=${initiatorSmac}], `
-            + `[responderSmac=${responderSmac}]`);
+        logger_1.logger.debug(`ezspCalculateSmacsHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [initiatorSmac=${initiatorSmac}], `
+            + `[responderSmac=${responderSmac}]`, NS);
     }
     /**
      * This call starts the generation of the ECC 283k1 curve Ephemeral
@@ -5059,8 +5079,8 @@ class Ezsp extends events_1.default {
      * @param ephemeralPublicKey EmberPublicKey283k1Data * The generated ephemeral public key.
      */
     ezspGenerateCbkeKeysHandler283k1(status, ephemeralPublicKey) {
-        debug(`ezspGenerateCbkeKeysHandler283k1(): callback called with: [status=${enums_1.EmberStatus[status]}], `
-            + `[ephemeralPublicKey=${ephemeralPublicKey}]`);
+        logger_1.logger.debug(`ezspGenerateCbkeKeysHandler283k1(): callback called with: [status=${enums_1.EmberStatus[status]}], `
+            + `[ephemeralPublicKey=${ephemeralPublicKey}]`, NS);
     }
     /**
      * Calculates the SMAC verification keys for both the initiator and responder
@@ -5096,8 +5116,8 @@ class Ezsp extends events_1.default {
      * @param responderSmac EmberSmacData * The calculated value of the responder's SMAC
      */
     ezspCalculateSmacsHandler283k1(status, initiatorSmac, responderSmac) {
-        debug(`ezspCalculateSmacsHandler283k1(): callback called with: [status=${enums_1.EmberStatus[status]}], [initiatorSmac=${initiatorSmac}], `
-            + `[responderSmac=${responderSmac}]`);
+        logger_1.logger.debug(`ezspCalculateSmacsHandler283k1(): callback called with: [status=${enums_1.EmberStatus[status]}], [initiatorSmac=${initiatorSmac}], `
+            + `[responderSmac=${responderSmac}]`, NS);
     }
     /**
      * Clears the temporary data associated with CBKE and the key establishment,
@@ -5219,7 +5239,7 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t *The message and attached which includes the original message and the appended signature.
      */
     ezspDsaSignHandler(status, messageContents) {
-        debug(`ezspDsaSignHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [messageContents=${messageContents.toString('hex')}]`);
+        logger_1.logger.debug(`ezspDsaSignHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * Verify that signature of the associated message digest was signed by the
@@ -5253,7 +5273,7 @@ class Ezsp extends events_1.default {
      * @param status The result of the DSA verification operation.
      */
     ezspDsaVerifyHandler(status) {
-        debug(`ezspDsaVerifyHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`);
+        logger_1.logger.debug(`ezspDsaVerifyHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`, NS);
     }
     /**
      * Verify that signature of the associated message digest was signed by the
@@ -5465,7 +5485,7 @@ class Ezsp extends events_1.default {
     async mfglibSetPower(txPowerMode, power) {
         this.startCommand(enums_2.EzspFrameID.MFGLIB_SET_POWER);
         this.buffalo.writeUInt16(txPowerMode);
-        this.buffalo.writeUInt8(power);
+        this.buffalo.writeInt8(power);
         const sendStatus = await this.sendCommand();
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
@@ -5483,7 +5503,7 @@ class Ezsp extends events_1.default {
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
         }
-        const power = this.buffalo.readUInt8();
+        const power = this.buffalo.readInt8();
         return power;
     }
     /**
@@ -5495,9 +5515,8 @@ class Ezsp extends events_1.default {
      * @param packetContents uint8_t * The received packet (last 2 bytes are not FCS / CRC and may be discarded)
      */
     ezspMfglibRxHandler(linkQuality, rssi, packetLength, packetContents) {
-        debug(`ezspMfglibRxHandler(): callback called with: [linkQuality=${linkQuality}], [rssi=${rssi}], `
-            + `[packetLength=${packetLength}], [packetContents=${packetContents}]`);
-        // gecko_sdk_4.4.0\protocol\zigbee\app\framework\plugin\manufacturing-library-cli\manufacturing-library-cli-host.c
+        logger_1.logger.debug(`ezspMfglibRxHandler(): callback called with: [linkQuality=${linkQuality}], [rssi=${rssi}], `
+            + `[packetLength=${packetLength}], [packetContents=${packetContents}]`, NS);
     }
     //-----------------------------------------------------------------------------
     // Bootloader Frames
@@ -5579,8 +5598,8 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t *The bootload message that was sent.
      */
     ezspIncomingBootloadMessageHandler(longId, lastHopLqi, lastHopRssi, messageContents) {
-        debug(`ezspIncomingBootloadMessageHandler(): callback called with: [longId=${longId}], [lastHopLqi=${lastHopLqi}], `
-            + `[lastHopRssi=${lastHopRssi}], [messageContents=${messageContents.toString('hex')}]`);
+        logger_1.logger.debug(`ezspIncomingBootloadMessageHandler(): callback called with: [longId=${longId}], [lastHopLqi=${lastHopLqi}], `
+            + `[lastHopRssi=${lastHopRssi}], [messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * Callback
@@ -5592,8 +5611,8 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The message that was sent.
      */
     ezspBootloadTransmitCompleteHandler(status, messageContents) {
-        debug(`ezspBootloadTransmitCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], `
-            + `[messageContents=${messageContents.toString('hex')}]`);
+        logger_1.logger.debug(`ezspBootloadTransmitCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], `
+            + `[messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * Perform AES encryption on plaintext using key.
@@ -5609,7 +5628,7 @@ class Ezsp extends events_1.default {
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
         }
-        const ciphertext = this.buffalo.readListUInt8({ length: 16 });
+        const ciphertext = this.buffalo.readListUInt8(consts_1.EMBER_ENCRYPTION_KEY_SIZE);
         return ciphertext;
     }
     //-----------------------------------------------------------------------------
@@ -5627,7 +5646,7 @@ class Ezsp extends events_1.default {
         this.startCommand(enums_2.EzspFrameID.ZLL_NETWORK_OPS);
         this.buffalo.writeEmberZllNetwork(networkInfo);
         this.buffalo.writeUInt8(op);
-        this.buffalo.writeUInt8(radioTxPower);
+        this.buffalo.writeInt8(radioTxPower);
         const sendStatus = await this.sendCommand();
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new Error(enums_1.EzspStatus[sendStatus]);
@@ -5680,7 +5699,7 @@ class Ezsp extends events_1.default {
     async ezspZllStartScan(channelMask, radioPowerForScan, nodeType) {
         this.startCommand(enums_2.EzspFrameID.ZLL_START_SCAN);
         this.buffalo.writeUInt32(channelMask);
-        this.buffalo.writeUInt8(radioPowerForScan);
+        this.buffalo.writeInt8(radioPowerForScan);
         this.buffalo.writeUInt8(nodeType);
         const sendStatus = await this.sendCommand();
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
@@ -5715,8 +5734,8 @@ class Ezsp extends events_1.default {
      * @param lastHopRssi int8_t The energy level (in units of dBm) observed during reception.
      */
     ezspZllNetworkFoundHandler(networkInfo, isDeviceInfoNull, deviceInfo, lastHopLqi, lastHopRssi) {
-        debug(`ezspZllNetworkFoundHandler(): callback called with: [networkInfo=${networkInfo}], [isDeviceInfoNull=${isDeviceInfoNull}], `
-            + `[deviceInfo=${deviceInfo}], [lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}]`);
+        logger_1.logger.debug(`ezspZllNetworkFoundHandler(): callback called with: [networkInfo=${networkInfo}], [isDeviceInfoNull=${isDeviceInfoNull}], `
+            + `[deviceInfo=${deviceInfo}], [lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}]`, NS);
     }
     /**
      * Callback
@@ -5724,7 +5743,7 @@ class Ezsp extends events_1.default {
      * @param status Status of the operation.
      */
     ezspZllScanCompleteHandler(status) {
-        debug(`ezspZllScanCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`);
+        logger_1.logger.debug(`ezspZllScanCompleteHandler(): callback called with: [status=${enums_1.EmberStatus[status]}]`, NS);
     }
     /**
      * Callback
@@ -5735,8 +5754,8 @@ class Ezsp extends events_1.default {
      * @param lastHopRssi int8_t The energy level (in units of dBm) observed during reception.
      */
     ezspZllAddressAssignmentHandler(addressInfo, lastHopLqi, lastHopRssi) {
-        debug(`ezspZllAddressAssignmentHandler(): callback called with: [addressInfo=${addressInfo}], [lastHopLqi=${lastHopLqi}], `
-            + `[lastHopRssi=${lastHopRssi}]`);
+        logger_1.logger.debug(`ezspZllAddressAssignmentHandler(): callback called with: [addressInfo=${addressInfo}], [lastHopLqi=${lastHopLqi}], `
+            + `[lastHopRssi=${lastHopRssi}]`, NS);
     }
     /**
      * Callback
@@ -5744,7 +5763,7 @@ class Ezsp extends events_1.default {
      * @param networkInfo EmberZllNetwork * Information about the network.
      */
     ezspZllTouchLinkTargetHandler(networkInfo) {
-        debug(`ezspZllTouchLinkTargetHandler(): callback called with: [networkInfo=${networkInfo}]`);
+        logger_1.logger.debug(`ezspZllTouchLinkTargetHandler(): callback called with: [networkInfo=${networkInfo}]`, NS);
     }
     /**
      * Get the ZLL tokens.
@@ -6094,7 +6113,7 @@ class Ezsp extends events_1.default {
      * @param gpepHandle uint8_t The handle of the GPDF.
      */
     ezspDGpSentHandler(status, gpepHandle) {
-        debug(`ezspDGpSentHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [gpepHandle=${gpepHandle}]`);
+        logger_1.logger.debug(`ezspDGpSentHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [gpepHandle=${gpepHandle}]`, NS);
     }
     /**
      * Callback
@@ -6115,24 +6134,24 @@ class Ezsp extends events_1.default {
      * @param gpdCommandPayload uint8_t * The GPD command payload.
      */
     ezspGpepIncomingMessageHandler(status, gpdLink, sequenceNumber, addr, gpdfSecurityLevel, gpdfSecurityKeyType, autoCommissioning, bidirectionalInfo, gpdSecurityFrameCounter, gpdCommandId, mic, proxyTableIndex, gpdCommandPayload) {
-        debug(`ezspGpepIncomingMessageHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [gpdLink=${gpdLink}], `
+        logger_1.logger.debug(`ezspGpepIncomingMessageHandler(): callback called with: [status=${enums_1.EmberStatus[status]}], [gpdLink=${gpdLink}], `
             + `[sequenceNumber=${sequenceNumber}], [addr=${JSON.stringify(addr)}], [gpdfSecurityLevel=${enums_1.EmberGpSecurityLevel[gpdfSecurityLevel]}], `
             + `[gpdfSecurityKeyType=${enums_1.EmberGpKeyType[gpdfSecurityKeyType]}], [autoCommissioning=${autoCommissioning}], `
             + `[bidirectionalInfo=${bidirectionalInfo}], [gpdSecurityFrameCounter=${gpdSecurityFrameCounter}], [gpdCommandId=${gpdCommandId}], `
-            + `[mic=${mic}], [proxyTableIndex=${proxyTableIndex}], [gpdCommandPayload=${gpdCommandPayload.toString('hex')}]`);
+            + `[mic=${mic}], [proxyTableIndex=${proxyTableIndex}], [gpdCommandPayload=${gpdCommandPayload.toString('hex')}]`, NS);
         if (addr.applicationId === enums_1.EmberGpApplicationId.IEEE_ADDRESS) {
             // XXX: don't bother parsing for upstream for now, since it will be rejected
-            console.error(`<=== [GP] Received IEEE address type in message. Support not implemented upstream. Dropping.`);
+            logger_1.logger.error(`<=== [GP] Received IEEE address type in message. Support not implemented upstream. Dropping.`, NS);
             return;
         }
-        let commandIdentifier = cluster_1.default.greenPower.commands.notification.ID;
+        let commandIdentifier = cluster_1.Clusters.greenPower.commands.notification.ID;
         if (gpdCommandId === 0xE0) {
             if (!gpdCommandPayload.length) {
                 // XXX: seem to be receiving duplicate commissioningNotification from some devices, second one with empty payload?
                 //      this will mess with the process no doubt, so dropping them
                 return;
             }
-            commandIdentifier = cluster_1.default.greenPower.commands.commissioningNotification.ID;
+            commandIdentifier = cluster_1.Clusters.greenPower.commands.commissioningNotification.ID;
         }
         this.emit(EzspEvents.GREENPOWER_MESSAGE, sequenceNumber, commandIdentifier, addr.sourceId, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gpdLink);
     }