zigbee-herdsman 0.51.0 → 0.53.0

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

@@ -29,20 +29,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ezsp = exports.EzspEvents = void 0;
 /* istanbul ignore file */
 const events_1 = __importDefault(require("events"));
-const cluster_1 = require("../../../zspec/zcl/definition/cluster");
+const utils_1 = require("../../../utils");
+const logger_1 = require("../../../utils/logger");
 const ZSpec = __importStar(require("../../../zspec"));
+const cluster_1 = require("../../../zspec/zcl/definition/cluster");
 const Zdo = __importStar(require("../../../zspec/zdo"));
-const math_1 = require("../utils/math");
-const enums_1 = require("../enums");
-const consts_1 = require("./consts");
-const enums_2 = require("./enums");
-const ash_1 = require("../uart/ash");
-const buffalo_1 = require("./buffalo");
-const consts_2 = require("../consts");
 const endpoints_1 = require("../adapter/endpoints");
-const logger_1 = require("../../../utils/logger");
+const consts_1 = require("../consts");
+const enums_1 = require("../enums");
 const ezspError_1 = require("../ezspError");
+const ash_1 = require("../uart/ash");
 const initters_1 = require("../utils/initters");
+const math_1 = require("../utils/math");
+const buffalo_1 = require("./buffalo");
+const consts_2 = require("./consts");
+const enums_2 = require("./enums");
 const NS = 'zh:ember:ezsp';
 /** no multi-network atm, so just use const */
 const DEFAULT_NETWORK_INDEX = endpoints_1.FIXED_ENDPOINTS[0].networkIndex;
@@ -63,7 +64,7 @@ const ZA_MAX_HOPS = 12;
  * The mask applied to generated message tags used by the framework when sending messages via EZSP.
  * Customers who call ezspSend functions directly must use message tags outside this mask.
  */
-const MESSAGE_TAG_MASK = 0x7F;
+const MESSAGE_TAG_MASK = 0x7f;
 var EzspEvents;
 (function (EzspEvents) {
     //-- An error was detected that requires resetting the NCP.
@@ -95,7 +96,6 @@ var EzspEvents;
  */
 class Ezsp extends events_1.default {
     version;
-    tickInterval;
     ash;
     buffalo;
     /** The contents of the current EZSP frame. CAREFUL using this guy, it's pre-allocated. */
@@ -108,22 +108,22 @@ class Ezsp extends events_1.default {
     /** The total Length of the incoming frame */
     callbackFrameLength;
     initialVersionSent;
-    /** True if a command is in the process of being sent. */
-    sendingCommand;
     /** EZSP frame sequence number. Used in EZSP_SEQUENCE_INDEX byte. */
     frameSequence;
     /** Sequence used for EZSP send() tagging. static uint8_t */
     sendSequence;
+    queue;
     /** Awaiting response resolve/timer struct. Null if not waiting for response. */
     responseWaiter;
     /** Counter for Queue Full errors */
     counterErrQueueFull;
     constructor(options) {
         super();
-        this.frameContents = Buffer.alloc(consts_1.EZSP_MAX_FRAME_LENGTH);
+        this.frameContents = Buffer.alloc(consts_2.EZSP_MAX_FRAME_LENGTH);
         this.buffalo = new buffalo_1.EzspBuffalo(this.frameContents);
-        this.callbackFrameContents = Buffer.alloc(consts_1.EZSP_MAX_FRAME_LENGTH);
+        this.callbackFrameContents = Buffer.alloc(consts_2.EZSP_MAX_FRAME_LENGTH);
         this.callbackBuffalo = new buffalo_1.EzspBuffalo(this.callbackFrameContents);
+        this.queue = new utils_1.Queue(1);
         this.ash = new ash_1.UartAsh(options);
     }
     /**
@@ -135,25 +135,23 @@ class Ezsp extends events_1.default {
         return this.ash.rxQueue.length;
     }
     /**
-     * Create a string representation of the last frame in storage (sent or received).
+     * Create a string representation of the last received frame in storage.
      */
     get frameToString() {
         const id = this.buffalo.getFrameId();
-        return `[FRAME: ID=${id}:"${enums_2.EzspFrameID[id]}" Seq=${this.frameContents[consts_1.EZSP_SEQUENCE_INDEX]} Len=${this.frameLength}]`;
+        return `[FRAME: ID=${id}:"${enums_2.EzspFrameID[id]}" Seq=${this.frameContents[consts_2.EZSP_SEQUENCE_INDEX]} Len=${this.frameLength}]`;
     }
     /**
-     * Create a string representation of the last callback frame in storage (received only).
+     * Create a string representation of the last received callback frame in storage.
      */
     get callbackFrameToString() {
         const id = this.callbackBuffalo.getFrameId();
-        return `[CBFRAME: ID=${id}:"${enums_2.EzspFrameID[id]}" Seq=${this.callbackFrameContents[consts_1.EZSP_SEQUENCE_INDEX]} Len=${this.callbackFrameLength}]`;
+        return `[CBFRAME: ID=${id}:"${enums_2.EzspFrameID[id]}" Seq=${this.callbackFrameContents[consts_2.EZSP_SEQUENCE_INDEX]} Len=${this.callbackFrameLength}]`;
     }
     initVariables() {
-        if (this.responseWaiter != null) {
-            clearTimeout(this.responseWaiter.timer);
-        }
         this.ash.removeAllListeners(ash_1.AshEvents.FATAL_ERROR);
         this.ash.removeAllListeners(ash_1.AshEvents.FRAME);
+        this.queue.clear();
         this.frameContents.fill(0);
         this.frameLength = 0;
         this.buffalo.setPosition(0);
@@ -161,10 +159,8 @@ class Ezsp extends events_1.default {
         this.callbackFrameLength = 0;
         this.callbackBuffalo.setPosition(0);
         this.initialVersionSent = false;
-        this.sendingCommand = false;
         this.frameSequence = -1; // start at 0
         this.sendSequence = 0; // start at 1
-        this.responseWaiter = null;
         this.counterErrQueueFull = 0;
     }
     async start() {
@@ -233,7 +229,7 @@ class Ezsp extends events_1.default {
         }
         this.ash.rxQueue.removeEntry(buffer);
         // logger.debug(`<<<< ${buffer.data.subarray(0, buffer.len).toString('hex')}`, NS);
-        if (buffer.data[consts_1.EZSP_FRAME_CONTROL_INDEX] & consts_1.EZSP_FRAME_CONTROL_ASYNCH_CB) {
+        if (buffer.data[consts_2.EZSP_FRAME_CONTROL_INDEX] & consts_2.EZSP_FRAME_CONTROL_ASYNCH_CB) {
             // take only what len tells us is actual content
             buffer.data.copy(this.callbackFrameContents, 0, 0, buffer.len);
             this.callbackFrameLength = buffer.len;
@@ -289,31 +285,30 @@ class Ezsp extends events_1.default {
         // resetting under these conditions does not solve the problem as the problem is external to the NCP.
         // Throttling the additional traffic and staggering things might make it better instead.
         // For all other errors, we reset the NCP
-        if ((status !== enums_1.EzspStatus.ERROR_SECURITY_PARAMETERS_INVALID) && (status !== enums_1.EzspStatus.ERROR_OVERFLOW)
-            && (status !== enums_1.EzspStatus.ERROR_QUEUE_FULL) && (status !== enums_1.EzspStatus.ERROR_WRONG_DIRECTION)) {
+        if (status !== enums_1.EzspStatus.ERROR_SECURITY_PARAMETERS_INVALID &&
+            status !== enums_1.EzspStatus.ERROR_OVERFLOW &&
+            status !== enums_1.EzspStatus.ERROR_QUEUE_FULL &&
+            status !== enums_1.EzspStatus.ERROR_WRONG_DIRECTION) {
             this.emit(EzspEvents.NCP_NEEDS_RESET_AND_INIT, status);
         }
     }
     nextFrameSequence() {
-        return (this.frameSequence = ((++this.frameSequence) & 0xFF));
+        return (this.frameSequence = ++this.frameSequence & 0xff);
     }
     startCommand(command) {
-        if (this.sendingCommand) {
-            logger_1.logger.error(`[SEND COMMAND] Cannot send second one before processing response from first one.`, NS);
-            throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_CALL);
-        }
-        this.sendingCommand = true;
+        const sendBuffalo = new buffalo_1.EzspBuffalo(Buffer.alloc(consts_2.EZSP_MAX_FRAME_LENGTH));
         // Send initial EZSP_VERSION command with old packet format for old Hosts/NCPs
         if (command === enums_2.EzspFrameID.VERSION && !this.initialVersionSent) {
-            this.buffalo.setPosition(consts_1.EZSP_PARAMETERS_INDEX);
-            this.buffalo.setCommandByte(consts_1.EZSP_FRAME_ID_INDEX, (0, math_1.lowByte)(command));
+            sendBuffalo.setPosition(consts_2.EZSP_PARAMETERS_INDEX);
+            sendBuffalo.setCommandByte(consts_2.EZSP_FRAME_ID_INDEX, (0, math_1.lowByte)(command));
         }
         else {
             // convert to extended frame format
-            this.buffalo.setPosition(consts_1.EZSP_EXTENDED_PARAMETERS_INDEX);
-            this.buffalo.setCommandByte(consts_1.EZSP_EXTENDED_FRAME_ID_LB_INDEX, (0, math_1.lowByte)(command));
-            this.buffalo.setCommandByte(consts_1.EZSP_EXTENDED_FRAME_ID_HB_INDEX, (0, math_1.highByte)(command));
+            sendBuffalo.setPosition(consts_2.EZSP_EXTENDED_PARAMETERS_INDEX);
+            sendBuffalo.setCommandByte(consts_2.EZSP_EXTENDED_FRAME_ID_LB_INDEX, (0, math_1.lowByte)(command));
+            sendBuffalo.setCommandByte(consts_2.EZSP_EXTENDED_FRAME_ID_HB_INDEX, (0, math_1.highByte)(command));
         }
+        return sendBuffalo;
     }
     /**
      * Sends the current EZSP command frame. Returns EZSP_SUCCESS if the command was sent successfully.
@@ -331,7 +326,7 @@ class Ezsp extends events_1.default {
      *   - EzspStatus.DATA_FRAME_TOO_LONG
      *   - EzspStatus.NOT_CONNECTED
      *
-     * if ezsp.sendCommand times out, this will be EzspStatus.ASH_ACK_TIMEOUT (XXX: for now)
+     * if ezsp.sendCommand times out, this will be EzspStatus.ASH_ERROR_TIMEOUTS
      *
      * if ezsp.sendCommand resolves, this will be whatever ezsp.responseReceived returns:
      *   - EzspStatus.NO_RX_DATA (should not happen if command was sent (since we subscribe to frame event to trigger function))
@@ -341,55 +336,63 @@ class Ezsp extends events_1.default {
      *   - EzspStatus.ERROR_TRUNCATED
      *   - EzspStatus.SUCCESS
      */
-    async sendCommand() {
+    async sendCommand(sendBuffalo) {
         if (!this.checkConnection()) {
             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());
+        const sequence = this.nextFrameSequence();
+        sendBuffalo.setCommandByte(consts_2.EZSP_SEQUENCE_INDEX, sequence);
         // we always set the network index in the ezsp frame control.
-        this.buffalo.setCommandByte(consts_1.EZSP_EXTENDED_FRAME_CONTROL_LB_INDEX, (consts_1.EZSP_FRAME_CONTROL_COMMAND | (DEFAULT_SLEEP_MODE & consts_1.EZSP_FRAME_CONTROL_SLEEP_MODE_MASK)
-            | ((DEFAULT_NETWORK_INDEX << consts_1.EZSP_FRAME_CONTROL_NETWORK_INDEX_OFFSET) & consts_1.EZSP_FRAME_CONTROL_NETWORK_INDEX_MASK)));
+        sendBuffalo.setCommandByte(consts_2.EZSP_EXTENDED_FRAME_CONTROL_LB_INDEX, consts_2.EZSP_FRAME_CONTROL_COMMAND |
+            (DEFAULT_SLEEP_MODE & consts_2.EZSP_FRAME_CONTROL_SLEEP_MODE_MASK) |
+            ((DEFAULT_NETWORK_INDEX << consts_2.EZSP_FRAME_CONTROL_NETWORK_INDEX_OFFSET) & consts_2.EZSP_FRAME_CONTROL_NETWORK_INDEX_MASK));
         // Send initial EZSP_VERSION command with old packet format for old Hosts/NCPs
-        if (!this.initialVersionSent && (this.buffalo.getCommandByte(consts_1.EZSP_FRAME_ID_INDEX) === enums_2.EzspFrameID.VERSION)) {
+        if (!this.initialVersionSent && sendBuffalo.getCommandByte(consts_2.EZSP_FRAME_ID_INDEX) === enums_2.EzspFrameID.VERSION) {
             this.initialVersionSent = true;
         }
         else {
-            this.buffalo.setCommandByte(consts_1.EZSP_EXTENDED_FRAME_CONTROL_HB_INDEX, consts_1.EZSP_EXTENDED_FRAME_FORMAT_VERSION);
+            sendBuffalo.setCommandByte(consts_2.EZSP_EXTENDED_FRAME_CONTROL_HB_INDEX, consts_2.EZSP_EXTENDED_FRAME_FORMAT_VERSION);
         }
         // might have tried to write more than allocated EZSP_MAX_FRAME_LENGTH for frameContents
         // use write index to detect broken frames cases (inc'ed every time a byte is supposed to have been written)
         // since index is always inc'ed on setCommandByte, this should always end at 202 max
-        const length = this.buffalo.getPosition();
-        if (length > consts_1.EZSP_MAX_FRAME_LENGTH) {
+        const length = sendBuffalo.getPosition();
+        if (length > consts_2.EZSP_MAX_FRAME_LENGTH) {
             // this.ezspErrorHandler(EzspStatus.ERROR_COMMAND_TOO_LONG);// XXX: this forces a NCP reset??
             return enums_1.EzspStatus.ERROR_COMMAND_TOO_LONG;
         }
-        this.frameLength = length;
-        let status;
-        logger_1.logger.debug(`===> ${this.frameToString}`, NS);
-        try {
-            status = await new Promise((resolve, reject) => {
-                const sendStatus = (this.ash.send(this.frameLength, this.frameContents));
-                if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
-                    return reject(new ezspError_1.EzspError(sendStatus));
+        return this.queue.execute(async () => {
+            let status = enums_1.EzspStatus.ASH_ERROR_TIMEOUTS; // will be overwritten below as necessary
+            const frameId = sendBuffalo.getFrameId();
+            const frameString = `[FRAME: ID=${frameId}:"${enums_2.EzspFrameID[frameId]}" Seq=${sequence} Len=${length}]`;
+            logger_1.logger.debug(`===> ${frameString}`, NS);
+            try {
+                status = await new Promise((resolve, reject) => {
+                    const sendStatus = this.ash.send(length, sendBuffalo.getBuffer());
+                    if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
+                        reject(new ezspError_1.EzspError(sendStatus));
+                        return;
+                    }
+                    this.responseWaiter = {
+                        timer: setTimeout(() => reject(new ezspError_1.EzspError(enums_1.EzspStatus.ASH_ERROR_TIMEOUTS)), this.ash.responseTimeout),
+                        resolve,
+                    };
+                });
+                if (status !== enums_1.EzspStatus.SUCCESS) {
+                    throw new ezspError_1.EzspError(status);
                 }
-                this.responseWaiter = {
-                    timer: setTimeout(() => reject(new ezspError_1.EzspError(enums_1.EzspStatus.ASH_ERROR_TIMEOUTS)), this.ash.responseTimeout),
-                    resolve,
-                };
-            });
-            if (status !== enums_1.EzspStatus.SUCCESS) {
-                throw new ezspError_1.EzspError(status);
             }
-        }
-        catch (error) {
-            this.responseWaiter = null;
-            logger_1.logger.debug(`=x=> ${this.frameToString} ${error}`, NS);
-            this.ezspErrorHandler(status);
-        }
-        this.sendingCommand = false;
-        return status;
+            catch (error) {
+                this.responseWaiter = null;
+                logger_1.logger.debug(`=x=> ${frameString} ${error}`, NS);
+                if (error instanceof ezspError_1.EzspError) {
+                    status = error.code;
+                    this.ezspErrorHandler(status);
+                }
+            }
+            return status;
+        });
     }
     /**
      * Sets the stage for parsing if valid (indexes buffalo to params index).
@@ -403,16 +406,16 @@ class Ezsp extends events_1.default {
         if (frameId === enums_2.EzspFrameID.INVALID_COMMAND) {
             status = buffalo.getResponseByte(parametersIndex);
         }
-        if ((frameControl & consts_1.EZSP_FRAME_CONTROL_DIRECTION_MASK) !== consts_1.EZSP_FRAME_CONTROL_RESPONSE) {
+        if ((frameControl & consts_2.EZSP_FRAME_CONTROL_DIRECTION_MASK) !== consts_2.EZSP_FRAME_CONTROL_RESPONSE) {
             status = enums_1.EzspStatus.ERROR_WRONG_DIRECTION;
         }
-        if ((frameControl & consts_1.EZSP_FRAME_CONTROL_TRUNCATED_MASK) === consts_1.EZSP_FRAME_CONTROL_TRUNCATED) {
+        if ((frameControl & consts_2.EZSP_FRAME_CONTROL_TRUNCATED_MASK) === consts_2.EZSP_FRAME_CONTROL_TRUNCATED) {
             status = enums_1.EzspStatus.ERROR_TRUNCATED;
         }
-        if ((frameControl & consts_1.EZSP_FRAME_CONTROL_OVERFLOW_MASK) === consts_1.EZSP_FRAME_CONTROL_OVERFLOW) {
+        if ((frameControl & consts_2.EZSP_FRAME_CONTROL_OVERFLOW_MASK) === consts_2.EZSP_FRAME_CONTROL_OVERFLOW) {
             status = enums_1.EzspStatus.ERROR_OVERFLOW;
         }
-        if ((frameControl & consts_1.EZSP_FRAME_CONTROL_PENDING_CB_MASK) === consts_1.EZSP_FRAME_CONTROL_PENDING_CB) {
+        if ((frameControl & consts_2.EZSP_FRAME_CONTROL_PENDING_CB_MASK) === consts_2.EZSP_FRAME_CONTROL_PENDING_CB) {
             this.ash.ncpHasCallbacks = true;
         }
         else {
@@ -428,7 +431,7 @@ class Ezsp extends events_1.default {
         // The system can still communicate but buffers are running critically low.
         // This is almost always due to network congestion and goes away when the network becomes quieter.
         if (status === enums_1.EzspStatus.ERROR_OVERFLOW) {
-            return enums_1.EzspStatus.SUCCESS;
+            status = enums_1.EzspStatus.SUCCESS;
         }
         return status;
     }
@@ -523,7 +526,7 @@ class Ezsp extends events_1.default {
                 break;
             }
             case enums_2.EzspFrameID.MESSAGE_SENT_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const type = this.callbackBuffalo.readUInt8();
                     const indexOrDestination = this.callbackBuffalo.readUInt16();
                     const apsFrame = this.callbackBuffalo.readEmberApsFrame();
@@ -557,7 +560,7 @@ class Ezsp extends events_1.default {
                 break;
             }
             case enums_2.EzspFrameID.INCOMING_MESSAGE_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const type = this.callbackBuffalo.readUInt8();
                     const apsFrame = this.callbackBuffalo.readEmberApsFrame();
                     const lastHopLqi = this.callbackBuffalo.readUInt8();
@@ -572,7 +575,7 @@ class Ezsp extends events_1.default {
                         addressIndex,
                         lastHopLqi,
                         lastHopRssi,
-                        lastHopTimestamp: 0
+                        lastHopTimestamp: 0,
                     };
                     const messageContents = this.callbackBuffalo.readPayload();
                     this.ezspIncomingMessageHandler(type, apsFrame, packetInfo, messageContents);
@@ -621,7 +624,7 @@ class Ezsp extends events_1.default {
                 break;
             }
             case enums_2.EzspFrameID.MAC_PASSTHROUGH_MESSAGE_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const messageType = this.callbackBuffalo.readUInt8();
                     const lastHopLqi = this.callbackBuffalo.readUInt8();
                     const lastHopRssi = this.callbackBuffalo.readInt8();
@@ -629,10 +632,10 @@ class Ezsp extends events_1.default {
                         senderShortId: ZSpec.NULL_NODE_ID,
                         senderLongId: ZSpec.BLANK_EUI64,
                         bindingIndex: ZSpec.NULL_BINDING,
-                        addressIndex: 0xFF,
+                        addressIndex: 0xff,
                         lastHopLqi,
                         lastHopRssi,
-                        lastHopTimestamp: 0
+                        lastHopTimestamp: 0,
                     };
                     const messageContents = this.callbackBuffalo.readPayload();
                     this.ezspMacPassthroughMessageHandler(messageType, packetInfo, messageContents);
@@ -646,7 +649,7 @@ class Ezsp extends events_1.default {
                 break;
             }
             case enums_2.EzspFrameID.MAC_FILTER_MATCH_MESSAGE_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const filterIndexMatch = this.callbackBuffalo.readUInt8();
                     const legacyPassthroughType = this.callbackBuffalo.readUInt8();
                     const lastHopLqi = this.callbackBuffalo.readUInt8();
@@ -655,10 +658,10 @@ class Ezsp extends events_1.default {
                         senderShortId: ZSpec.NULL_NODE_ID,
                         senderLongId: ZSpec.BLANK_EUI64,
                         bindingIndex: ZSpec.NULL_BINDING,
-                        addressIndex: 0xFF,
+                        addressIndex: 0xff,
                         lastHopLqi,
                         lastHopRssi,
-                        lastHopTimestamp: 0
+                        lastHopTimestamp: 0,
                     };
                     const messageContents = this.callbackBuffalo.readPayload();
                     this.ezspMacFilterMatchMessageHandler(filterIndexMatch, legacyPassthroughType, packetInfo, messageContents);
@@ -673,7 +676,7 @@ class Ezsp extends events_1.default {
                 break;
             }
             case enums_2.EzspFrameID.RAW_TRANSMIT_COMPLETE_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const status = this.callbackBuffalo.readStatus(this.version);
                     this.ezspRawTransmitCompleteHandler(Buffer.alloc(0), status);
                 }
@@ -744,13 +747,12 @@ class Ezsp extends events_1.default {
             case enums_2.EzspFrameID.MFGLIB_RX_HANDLER: {
                 const linkQuality = this.callbackBuffalo.readUInt8();
                 const rssi = this.callbackBuffalo.readInt8();
-                const packetLength = this.callbackBuffalo.readUInt8();
-                const packetContents = this.callbackBuffalo.readListUInt8(packetLength);
-                this.ezspMfglibRxHandler(linkQuality, rssi, packetLength, packetContents);
+                const packetContents = this.callbackBuffalo.readPayload();
+                this.ezspMfglibRxHandler(linkQuality, rssi, packetContents);
                 break;
             }
             case enums_2.EzspFrameID.INCOMING_BOOTLOAD_MESSAGE_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const longId = this.callbackBuffalo.readIeeeAddr();
                     const lastHopLqi = this.callbackBuffalo.readUInt8();
                     const lastHopRssi = this.callbackBuffalo.readInt8();
@@ -758,7 +760,7 @@ class Ezsp extends events_1.default {
                         senderShortId: ZSpec.NULL_NODE_ID,
                         senderLongId: ZSpec.BLANK_EUI64,
                         bindingIndex: ZSpec.NULL_BINDING,
-                        addressIndex: 0xFF,
+                        addressIndex: 0xff,
                         lastHopLqi,
                         lastHopRssi,
                         lastHopTimestamp: 0,
@@ -787,7 +789,7 @@ class Ezsp extends events_1.default {
                 break;
             }
             case enums_2.EzspFrameID.ZLL_NETWORK_FOUND_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const networkInfo = this.callbackBuffalo.readEmberZllNetwork();
                     const isDeviceInfoNull = this.callbackBuffalo.readUInt8() !== 0;
                     const deviceInfo = this.callbackBuffalo.readEmberZllDeviceInfoRecord();
@@ -797,7 +799,7 @@ class Ezsp extends events_1.default {
                         senderShortId: ZSpec.NULL_NODE_ID,
                         senderLongId: ZSpec.BLANK_EUI64,
                         bindingIndex: ZSpec.NULL_BINDING,
-                        addressIndex: 0xFF,
+                        addressIndex: 0xff,
                         lastHopLqi,
                         lastHopRssi,
                         lastHopTimestamp: 0,
@@ -819,7 +821,7 @@ class Ezsp extends events_1.default {
                 break;
             }
             case enums_2.EzspFrameID.ZLL_ADDRESS_ASSIGNMENT_HANDLER: {
-                if (this.version < 0x0E) {
+                if (this.version < 0x0e) {
                     const addressInfo = this.callbackBuffalo.readEmberZllAddressAssignment();
                     const lastHopLqi = this.callbackBuffalo.readUInt8();
                     const lastHopRssi = this.callbackBuffalo.readInt8();
@@ -827,7 +829,7 @@ class Ezsp extends events_1.default {
                         senderShortId: ZSpec.NULL_NODE_ID,
                         senderLongId: ZSpec.BLANK_EUI64,
                         bindingIndex: ZSpec.NULL_BINDING,
-                        addressIndex: 0xFF,
+                        addressIndex: 0xff,
                         lastHopLqi,
                         lastHopRssi,
                         lastHopTimestamp: 0,
@@ -878,7 +880,7 @@ class Ezsp extends events_1.default {
      * @returns uint8_t
      */
     nextSendSequence() {
-        return (this.sendSequence = ((++this.sendSequence) & MESSAGE_TAG_MASK));
+        return (this.sendSequence = ++this.sendSequence & MESSAGE_TAG_MASK);
     }
     /**
      * Calls ezspSend${x} based on type and takes care of tagging message.
@@ -891,11 +893,11 @@ class Ezsp extends events_1.default {
      *     Unused for multicast types.
      *     This must be one of the three ZigBee broadcast addresses for broadcast.
      * @param apsFrame [IN/OUT] EmberApsFrame * The APS frame which is to be added to the message.
+     *        Sequence set in OUT as returned by ezspSend${x} command
      * @param message uint8_t * Content of the message.
      * @param alias The alias source address
      * @param sequence uint8_t The alias sequence number
      * @returns Result of the ezspSend${x} call or EmberStatus.INVALID_PARAMETER if type not supported.
-     * @returns apsSequence as returned by ezspSend${x} command
      * @returns messageTag Tag used for ezspSend${x} command
      */
     async send(type, indexOrDestination, apsFrame, message, alias, sequence) {
@@ -908,30 +910,32 @@ class Ezsp extends events_1.default {
             case enums_1.EmberOutgoingMessageType.VIA_BINDING:
             case enums_1.EmberOutgoingMessageType.VIA_ADDRESS_TABLE:
             case enums_1.EmberOutgoingMessageType.DIRECT: {
-                [status, apsSequence] = (await this.ezspSendUnicast(type, indexOrDestination, apsFrame, messageTag, message));
+                [status, apsSequence] = await this.ezspSendUnicast(type, indexOrDestination, apsFrame, messageTag, message);
                 break;
             }
             case enums_1.EmberOutgoingMessageType.MULTICAST:
             case enums_1.EmberOutgoingMessageType.MULTICAST_WITH_ALIAS: {
                 if (type === enums_1.EmberOutgoingMessageType.MULTICAST_WITH_ALIAS ||
-                    (apsFrame.sourceEndpoint === ZSpec.GP_ENDPOINT && apsFrame.destinationEndpoint === ZSpec.GP_ENDPOINT &&
-                        (apsFrame.options & enums_1.EmberApsOption.USE_ALIAS_SEQUENCE_NUMBER))) {
+                    (apsFrame.sourceEndpoint === ZSpec.GP_ENDPOINT &&
+                        apsFrame.destinationEndpoint === ZSpec.GP_ENDPOINT &&
+                        apsFrame.options & enums_1.EmberApsOption.USE_ALIAS_SEQUENCE_NUMBER)) {
                     nwkRadius = apsFrame.radius;
                     nwkAlias = alias;
                 }
-                [status, apsSequence] = (await this.ezspSendMulticast(apsFrame, nwkRadius, 0, // broadcast addr
-                nwkAlias, sequence, messageTag, message));
+                [status, apsSequence] = await this.ezspSendMulticast(apsFrame, nwkRadius, 0, // broadcast addr
+                nwkAlias, sequence, messageTag, message);
                 break;
             }
             case enums_1.EmberOutgoingMessageType.BROADCAST:
             case enums_1.EmberOutgoingMessageType.BROADCAST_WITH_ALIAS: {
                 if (type == enums_1.EmberOutgoingMessageType.BROADCAST_WITH_ALIAS ||
-                    (apsFrame.sourceEndpoint == ZSpec.GP_ENDPOINT && apsFrame.destinationEndpoint == ZSpec.GP_ENDPOINT &&
-                        (apsFrame.options & enums_1.EmberApsOption.USE_ALIAS_SEQUENCE_NUMBER))) {
+                    (apsFrame.sourceEndpoint == ZSpec.GP_ENDPOINT &&
+                        apsFrame.destinationEndpoint == ZSpec.GP_ENDPOINT &&
+                        apsFrame.options & enums_1.EmberApsOption.USE_ALIAS_SEQUENCE_NUMBER)) {
                     nwkRadius = apsFrame.radius;
                     nwkAlias = alias;
                 }
-                [status, apsSequence] = (await this.ezspSendBroadcast(nwkAlias, indexOrDestination, sequence, apsFrame, nwkRadius, messageTag, message));
+                [status, apsSequence] = await this.ezspSendBroadcast(nwkAlias, indexOrDestination, sequence, apsFrame, nwkRadius, messageTag, message);
                 break;
             }
             default:
@@ -949,18 +953,21 @@ class Ezsp extends events_1.default {
      * @returns EmberVersion*, null if status not SUCCESS.
      */
     async ezspGetVersionStruct() {
-        const [status, outValueLength, outValue] = (await this.ezspGetValue(enums_2.EzspValueId.VERSION_INFO, 7)); // sizeof(EmberVersion)
+        const [status, outValueLength, outValue] = await this.ezspGetValue(enums_2.EzspValueId.VERSION_INFO, 7); // sizeof(EmberVersion)
         if (outValueLength !== 7) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_VALUE);
         }
-        return [status, {
-                build: outValue[0] + ((outValue[1]) << 8),
+        return [
+            status,
+            {
+                build: outValue[0] + (outValue[1] << 8),
                 major: outValue[2],
                 minor: outValue[3],
                 patch: outValue[4],
                 special: outValue[5],
                 type: outValue[6],
-            }];
+            },
+        ];
     }
     /**
      * Function for manipulating the endpoints flags on the NCP.
@@ -980,7 +987,7 @@ class Ezsp extends events_1.default {
      * @returns flags
      */
     async ezspGetEndpointFlags(endpoint) {
-        const [status, outValLen, outVal] = (await this.ezspGetExtendedValue(enums_2.EzspExtendedValueId.ENDPOINT_FLAGS, endpoint, 2));
+        const [status, outValLen, outVal] = await this.ezspGetExtendedValue(enums_2.EzspExtendedValueId.ENDPOINT_FLAGS, endpoint, 2);
         if (outValLen < 2) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_VALUE);
         }
@@ -995,7 +1002,7 @@ class Ezsp extends events_1.default {
      * @returns overhead uint8_t
      */
     async ezspGetSourceRouteOverhead(destination) {
-        const [status, outValLen, outVal] = (await this.ezspGetExtendedValue(enums_2.EzspExtendedValueId.GET_SOURCE_ROUTE_OVERHEAD, destination, 1));
+        const [status, outValLen, outVal] = await this.ezspGetExtendedValue(enums_2.EzspExtendedValueId.GET_SOURCE_ROUTE_OVERHEAD, destination, 1);
         if (outValLen < 1) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_VALUE);
         }
@@ -1008,7 +1015,7 @@ class Ezsp extends events_1.default {
      * @returns nodeId NodeId*
      */
     async ezspGetLastLeaveReason() {
-        const [status, outValLen, outVal] = (await this.ezspGetExtendedValue(enums_2.EzspExtendedValueId.LAST_LEAVE_REASON, 0, 3));
+        const [status, outValLen, outVal] = await this.ezspGetExtendedValue(enums_2.EzspExtendedValueId.LAST_LEAVE_REASON, 0, 3);
         if (outValLen < 3) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_VALUE);
         }
@@ -1020,7 +1027,7 @@ class Ezsp extends events_1.default {
      * @returns reason
      */
     async ezspGetLastRejoinReason() {
-        const [status, outValLen, outVal] = (await this.ezspGetValue(enums_2.EzspValueId.LAST_REJOIN_REASON, 1));
+        const [status, outValLen, outVal] = await this.ezspGetValue(enums_2.EzspValueId.LAST_REJOIN_REASON, 1);
         if (outValLen < 1) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_VALUE);
         }
@@ -1039,7 +1046,7 @@ class Ezsp extends events_1.default {
      * @returns
      */
     async ezspGetExtendedSecurityBitmask() {
-        const [status, outValLen, outVal] = (await this.ezspGetValue(enums_2.EzspValueId.EXTENDED_SECURITY_BITMASK, 2));
+        const [status, outValLen, outVal] = await this.ezspGetValue(enums_2.EzspValueId.EXTENDED_SECURITY_BITMASK, 2);
         if (outValLen < 2) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_VALUE);
         }
@@ -1077,9 +1084,9 @@ class Ezsp extends events_1.default {
      * @returns uint16_t * The version number of the stack.
      */
     async ezspVersion(desiredProtocolVersion) {
-        this.startCommand(enums_2.EzspFrameID.VERSION);
-        this.buffalo.writeUInt8(desiredProtocolVersion);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.VERSION);
+        sendBuffalo.writeUInt8(desiredProtocolVersion);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1098,9 +1105,9 @@ class Ezsp extends events_1.default {
      * @returns uint16_t * The configuration value.
      */
     async ezspGetConfigurationValue(configId) {
-        this.startCommand(enums_2.EzspFrameID.GET_CONFIGURATION_VALUE);
-        this.buffalo.writeUInt8(configId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_CONFIGURATION_VALUE);
+        sendBuffalo.writeUInt8(configId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1124,10 +1131,10 @@ class Ezsp extends events_1.default {
      *                               if configuration values can no longer be modified.
      */
     async ezspSetConfigurationValue(configId, value) {
-        this.startCommand(enums_2.EzspFrameID.SET_CONFIGURATION_VALUE);
-        this.buffalo.writeUInt8(configId);
-        this.buffalo.writeUInt16(value);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_CONFIGURATION_VALUE);
+        sendBuffalo.writeUInt8(configId);
+        sendBuffalo.writeUInt16(value);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1147,13 +1154,13 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * Attribute data.
      */
     async ezspReadAttribute(endpoint, cluster, attributeId, mask, manufacturerCode, readLength) {
-        this.startCommand(enums_2.EzspFrameID.READ_ATTRIBUTE);
-        this.buffalo.writeUInt8(endpoint);
-        this.buffalo.writeUInt16(cluster);
-        this.buffalo.writeUInt16(attributeId);
-        this.buffalo.writeUInt8(mask);
-        this.buffalo.writeUInt16(manufacturerCode);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.READ_ATTRIBUTE);
+        sendBuffalo.writeUInt8(endpoint);
+        sendBuffalo.writeUInt16(cluster);
+        sendBuffalo.writeUInt16(attributeId);
+        sendBuffalo.writeUInt8(mask);
+        sendBuffalo.writeUInt16(manufacturerCode);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1181,17 +1188,17 @@ class Ezsp extends events_1.default {
      * @returns An sl_zigbee_af_status_t value indicating success or the reason for failure.
      */
     async ezspWriteAttribute(endpoint, cluster, attributeId, mask, manufacturerCode, overrideReadOnlyAndDataType, justTest, dataType, data) {
-        this.startCommand(enums_2.EzspFrameID.WRITE_ATTRIBUTE);
-        this.buffalo.writeUInt8(endpoint);
-        this.buffalo.writeUInt16(cluster);
-        this.buffalo.writeUInt16(attributeId);
-        this.buffalo.writeUInt8(mask);
-        this.buffalo.writeUInt16(manufacturerCode);
-        this.buffalo.writeUInt8(overrideReadOnlyAndDataType ? 1 : 0);
-        this.buffalo.writeUInt8(justTest ? 1 : 0);
-        this.buffalo.writeUInt8(dataType);
-        this.buffalo.writePayload(data);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.WRITE_ATTRIBUTE);
+        sendBuffalo.writeUInt8(endpoint);
+        sendBuffalo.writeUInt16(cluster);
+        sendBuffalo.writeUInt16(attributeId);
+        sendBuffalo.writeUInt8(mask);
+        sendBuffalo.writeUInt16(manufacturerCode);
+        sendBuffalo.writeUInt8(overrideReadOnlyAndDataType ? 1 : 0);
+        sendBuffalo.writeUInt8(justTest ? 1 : 0);
+        sendBuffalo.writeUInt8(dataType);
+        sendBuffalo.writePayload(data);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1216,16 +1223,16 @@ class Ezsp extends events_1.default {
      *                               if endpoints can no longer be added.
      */
     async ezspAddEndpoint(endpoint, profileId, deviceId, deviceVersion, inputClusterList, outputClusterList) {
-        this.startCommand(enums_2.EzspFrameID.ADD_ENDPOINT);
-        this.buffalo.writeUInt8(endpoint);
-        this.buffalo.writeUInt16(profileId);
-        this.buffalo.writeUInt16(deviceId);
-        this.buffalo.writeUInt8(deviceVersion);
-        this.buffalo.writeUInt8(inputClusterList.length);
-        this.buffalo.writeUInt8(outputClusterList.length);
-        this.buffalo.writeListUInt16(inputClusterList);
-        this.buffalo.writeListUInt16(outputClusterList);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ADD_ENDPOINT);
+        sendBuffalo.writeUInt8(endpoint);
+        sendBuffalo.writeUInt16(profileId);
+        sendBuffalo.writeUInt16(deviceId);
+        sendBuffalo.writeUInt8(deviceVersion);
+        sendBuffalo.writeUInt8(inputClusterList.length);
+        sendBuffalo.writeUInt8(outputClusterList.length);
+        sendBuffalo.writeListUInt16(inputClusterList);
+        sendBuffalo.writeListUInt16(outputClusterList);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1242,10 +1249,10 @@ class Ezsp extends events_1.default {
      * - SLStatus.ZIGBEE_EZSP_ERROR if the NCP does not recognize policyId.
      */
     async ezspSetPolicy(policyId, decisionId) {
-        this.startCommand(enums_2.EzspFrameID.SET_POLICY);
-        this.buffalo.writeUInt8(policyId);
-        this.buffalo.writeUInt8(decisionId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_POLICY);
+        sendBuffalo.writeUInt8(policyId);
+        sendBuffalo.writeUInt8(decisionId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1261,9 +1268,9 @@ class Ezsp extends events_1.default {
      * @returns EzspDecisionId * The current decision for the specified policy.
      */
     async ezspGetPolicy(policyId) {
-        this.startCommand(enums_2.EzspFrameID.GET_POLICY);
-        this.buffalo.writeUInt8(policyId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_POLICY);
+        sendBuffalo.writeUInt8(policyId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1277,9 +1284,9 @@ class Ezsp extends events_1.default {
      * @returns true if the request was successfully handed to the stack, false otherwise
      */
     async ezspSendPanIdUpdate(newPan) {
-        this.startCommand(enums_2.EzspFrameID.SEND_PAN_ID_UPDATE);
-        this.buffalo.writeUInt16(newPan);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_PAN_ID_UPDATE);
+        sendBuffalo.writeUInt16(newPan);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1299,9 +1306,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The value.
      */
     async ezspGetValue(valueId, valueLength) {
-        this.startCommand(enums_2.EzspFrameID.GET_VALUE);
-        this.buffalo.writeUInt8(valueId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_VALUE);
+        sendBuffalo.writeUInt8(valueId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1329,10 +1336,10 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The value.
      */
     async ezspGetExtendedValue(valueId, characteristics, valueLength) {
-        this.startCommand(enums_2.EzspFrameID.GET_EXTENDED_VALUE);
-        this.buffalo.writeUInt8(valueId);
-        this.buffalo.writeUInt32(characteristics);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_EXTENDED_VALUE);
+        sendBuffalo.writeUInt8(valueId);
+        sendBuffalo.writeUInt32(characteristics);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1358,11 +1365,11 @@ class Ezsp extends events_1.default {
      *                               if the value could not be modified.
      */
     async ezspSetValue(valueId, valueLength, value) {
-        this.startCommand(enums_2.EzspFrameID.SET_VALUE);
-        this.buffalo.writeUInt8(valueId);
-        this.buffalo.writeUInt8(valueLength);
-        this.buffalo.writeListUInt8(value);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_VALUE);
+        sendBuffalo.writeUInt8(valueId);
+        sendBuffalo.writeUInt8(valueLength);
+        sendBuffalo.writeListUInt8(value);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1377,10 +1384,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetPassiveAckConfig(config, minAcksNeeded) {
-        this.startCommand(enums_2.EzspFrameID.SET_PASSIVE_ACK_CONFIG);
-        this.buffalo.writeUInt8(config);
-        this.buffalo.writeUInt8(minAcksNeeded);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_PASSIVE_ACK_CONFIG);
+        sendBuffalo.writeUInt8(config);
+        sendBuffalo.writeUInt8(minAcksNeeded);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1393,12 +1400,12 @@ class Ezsp extends events_1.default {
      * @param panId uint16_t PAN ID to be accepted in a network update.
      */
     async ezspSetPendingNetworkUpdatePanId(panId) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_PENDING_NETWORK_UPDATE_PAN_ID);
-        this.buffalo.writeUInt16(panId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_PENDING_NETWORK_UPDATE_PAN_ID);
+        sendBuffalo.writeUInt16(panId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1409,12 +1416,12 @@ class Ezsp extends events_1.default {
      * @returns uint8_t Endpoint number at the index.
      */
     async ezspGetEndpoint(index) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1426,11 +1433,11 @@ class Ezsp extends events_1.default {
      * @returns uint8_t Number of configured endpoints.
      */
     async ezspGetEndpointCount() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT_COUNT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT_COUNT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1443,12 +1450,12 @@ class Ezsp extends events_1.default {
      * @returns Description of this endpoint.
      */
     async ezspGetEndpointDescription(endpoint) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT_DESCRIPTION);
-        this.buffalo.writeUInt8(endpoint);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT_DESCRIPTION);
+        sendBuffalo.writeUInt8(endpoint);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1463,14 +1470,14 @@ class Ezsp extends events_1.default {
      * @returns ID of the requested cluster.
      */
     async ezspGetEndpointCluster(endpoint, listId, listIndex) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT_CLUSTER);
-        this.buffalo.writeUInt8(endpoint);
-        this.buffalo.writeUInt8(listId);
-        this.buffalo.writeUInt8(listIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ENDPOINT_CLUSTER);
+        sendBuffalo.writeUInt8(endpoint);
+        sendBuffalo.writeUInt8(listId);
+        sendBuffalo.writeUInt8(listIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1484,8 +1491,8 @@ class Ezsp extends events_1.default {
      * A command which does nothing. The Host can use this to set the sleep mode or to check the status of the NCP.
      */
     async ezspNop() {
-        this.startCommand(enums_2.EzspFrameID.NOP);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.NOP);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1497,9 +1504,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The echo of the data.
      */
     async ezspEcho(data) {
-        this.startCommand(enums_2.EzspFrameID.ECHO);
-        this.buffalo.writePayload(data);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ECHO);
+        sendBuffalo.writePayload(data);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1513,8 +1520,8 @@ class Ezsp extends events_1.default {
      * Allows the NCP to respond with a pending callback.
      */
     async ezspCallback() {
-        this.startCommand(enums_2.EzspFrameID.CALLBACK);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CALLBACK);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1534,10 +1541,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetToken(tokenId, tokenData) {
-        this.startCommand(enums_2.EzspFrameID.SET_TOKEN);
-        this.buffalo.writeUInt8(tokenId);
-        this.buffalo.writeListUInt8(tokenData);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_TOKEN);
+        sendBuffalo.writeUInt8(tokenId);
+        sendBuffalo.writeListUInt8(tokenData);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1551,9 +1558,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The contents of the token.
      */
     async ezspGetToken(tokenId) {
-        this.startCommand(enums_2.EzspFrameID.GET_TOKEN);
-        this.buffalo.writeUInt8(tokenId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_TOKEN);
+        sendBuffalo.writeUInt8(tokenId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1569,9 +1576,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The manufacturing token data.
      */
     async ezspGetMfgToken(tokenId) {
-        this.startCommand(enums_2.EzspFrameID.GET_MFG_TOKEN);
-        this.buffalo.writeUInt8(tokenId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_MFG_TOKEN);
+        sendBuffalo.writeUInt8(tokenId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1628,10 +1635,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetMfgToken(tokenId, tokenData) {
-        this.startCommand(enums_2.EzspFrameID.SET_MFG_TOKEN);
-        this.buffalo.writeUInt8(tokenId);
-        this.buffalo.writePayload(tokenData);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_MFG_TOKEN);
+        sendBuffalo.writeUInt8(tokenId);
+        sendBuffalo.writePayload(tokenData);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1652,8 +1659,8 @@ class Ezsp extends events_1.default {
      * @returns uint16_t * A pseudorandom number.
      */
     async ezspGetRandomNumber() {
-        this.startCommand(enums_2.EzspFrameID.GET_RANDOM_NUMBER);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_RANDOM_NUMBER);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1673,12 +1680,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetTimer(timerId, time, units, repeat) {
-        this.startCommand(enums_2.EzspFrameID.SET_TIMER);
-        this.buffalo.writeUInt8(timerId);
-        this.buffalo.writeUInt16(time);
-        this.buffalo.writeUInt8(units);
-        this.buffalo.writeUInt8(repeat ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_TIMER);
+        sendBuffalo.writeUInt8(timerId);
+        sendBuffalo.writeUInt16(time);
+        sendBuffalo.writeUInt8(units);
+        sendBuffalo.writeUInt8(repeat ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1695,9 +1702,9 @@ class Ezsp extends events_1.default {
      * @returns bool * True if a timerHandler callback will be generated repeatedly. False if only a single timerHandler callback will be generated.
      */
     async ezspGetTimer(timerId) {
-        this.startCommand(enums_2.EzspFrameID.GET_TIMER);
-        this.buffalo.writeUInt8(timerId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_TIMER);
+        sendBuffalo.writeUInt8(timerId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1721,10 +1728,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspDebugWrite(binaryMessage, messageContents) {
-        this.startCommand(enums_2.EzspFrameID.DEBUG_WRITE);
-        this.buffalo.writeUInt8(binaryMessage ? 1 : 0);
-        this.buffalo.writePayload(messageContents);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.DEBUG_WRITE);
+        sendBuffalo.writeUInt8(binaryMessage ? 1 : 0);
+        sendBuffalo.writePayload(messageContents);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1736,8 +1743,8 @@ class Ezsp extends events_1.default {
      * @returns uint16_t * A list of all counter values ordered according to the EmberCounterType enumeration.
      */
     async ezspReadAndClearCounters() {
-        this.startCommand(enums_2.EzspFrameID.READ_AND_CLEAR_COUNTERS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.READ_AND_CLEAR_COUNTERS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1749,8 +1756,8 @@ class Ezsp extends events_1.default {
      * @returns uint16_t * A list of all counter values ordered according to the EmberCounterType enumeration.
      */
     async ezspReadCounters() {
-        this.startCommand(enums_2.EzspFrameID.READ_COUNTERS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.READ_COUNTERS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1771,9 +1778,9 @@ class Ezsp extends events_1.default {
      * @param delay uint16_t Data will not be read from the host for this many milliseconds.
      */
     async ezspDelayTest(delay) {
-        this.startCommand(enums_2.EzspFrameID.DELAY_TEST);
-        this.buffalo.writeUInt16(delay);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.DELAY_TEST);
+        sendBuffalo.writeUInt16(delay);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1784,9 +1791,9 @@ class Ezsp extends events_1.default {
      * @returns The status of the library being queried.
      */
     async ezspGetLibraryStatus(libraryId) {
-        this.startCommand(enums_2.EzspFrameID.GET_LIBRARY_STATUS);
-        this.buffalo.writeUInt8(libraryId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_LIBRARY_STATUS);
+        sendBuffalo.writeUInt8(libraryId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1804,8 +1811,8 @@ class Ezsp extends events_1.default {
      * @returns versionNumber uint16_t * The version number of the XNCP application.
      */
     async ezspGetXncpInfo() {
-        this.startCommand(enums_2.EzspFrameID.GET_XNCP_INFO);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_XNCP_INFO);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1825,9 +1832,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t *The response.
      */
     async ezspCustomFrame(payload, replyLength) {
-        this.startCommand(enums_2.EzspFrameID.CUSTOM_FRAME);
-        this.buffalo.writePayload(payload);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CUSTOM_FRAME);
+        sendBuffalo.writePayload(payload);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1851,8 +1858,8 @@ class Ezsp extends events_1.default {
      * @returns The 64-bit ID.
      */
     async ezspGetEui64() {
-        this.startCommand(enums_2.EzspFrameID.GET_EUI64);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_EUI64);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1864,8 +1871,8 @@ class Ezsp extends events_1.default {
      * @returns The 16-bit ID.
      */
     async ezspGetNodeId() {
-        this.startCommand(enums_2.EzspFrameID.GET_NODE_ID);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_NODE_ID);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1877,8 +1884,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t Value indicate how many phy interfaces present.
      */
     async ezspGetPhyInterfaceCount() {
-        this.startCommand(enums_2.EzspFrameID.GET_PHY_INTERFACE_COUNT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_PHY_INTERFACE_COUNT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1890,8 +1897,8 @@ class Ezsp extends events_1.default {
      * @returns Value indicates the used entropy source.
      */
     async ezspGetTrueRandomEntropySource() {
-        this.startCommand(enums_2.EzspFrameID.GET_TRUE_RANDOM_ENTROPY_SOURCE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_TRUE_RANDOM_ENTROPY_SOURCE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1905,12 +1912,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetupDelayedJoin(networkKeyTimeoutS) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SETUP_DELAYED_JOIN);
-        this.buffalo.writeUInt8(networkKeyTimeoutS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SETUP_DELAYED_JOIN);
+        sendBuffalo.writeUInt8(networkKeyTimeoutS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1922,11 +1929,11 @@ class Ezsp extends events_1.default {
      * @returns The current priorities.
      */
     async ezspRadioGetSchedulerPriorities() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.RADIO_GET_SCHEDULER_PRIORITIES);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.RADIO_GET_SCHEDULER_PRIORITIES);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1938,12 +1945,12 @@ class Ezsp extends events_1.default {
      * @param priorities The current priorities.
      */
     async ezspRadioSetSchedulerPriorities(priorities) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.RADIO_SET_SCHEDULER_PRIORITIES);
-        this.buffalo.writeEmberMultiprotocolPriorities(priorities);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.RADIO_SET_SCHEDULER_PRIORITIES);
+        sendBuffalo.writeEmberMultiprotocolPriorities(priorities);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1953,11 +1960,11 @@ class Ezsp extends events_1.default {
      * @returns Value of the current slip time.
      */
     async ezspRadioGetSchedulerSliptime() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.RADIO_GET_SCHEDULER_SLIPTIME);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.RADIO_GET_SCHEDULER_SLIPTIME);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1969,12 +1976,12 @@ class Ezsp extends events_1.default {
      * @param slipTime Value of the current slip time.
      */
     async ezspRadioSetSchedulerSliptime(slipTime) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.RADIO_SET_SCHEDULER_SLIPTIME);
-        this.buffalo.writeUInt32(slipTime);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.RADIO_SET_SCHEDULER_SLIPTIME);
+        sendBuffalo.writeUInt32(slipTime);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -1985,12 +1992,12 @@ class Ezsp extends events_1.default {
      * @returns Whether this counter requires a PHY index when operating on a dual-PHY system.
      */
     async ezspCounterRequiresPhyIndex(counter) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.COUNTER_REQUIRES_PHY_INDEX);
-        this.buffalo.writeUInt8(counter);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.COUNTER_REQUIRES_PHY_INDEX);
+        sendBuffalo.writeUInt8(counter);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2003,12 +2010,12 @@ class Ezsp extends events_1.default {
      * @returns Whether this counter requires the destination node ID.
      */
     async ezspCounterRequiresDestinationNodeId(counter) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.COUNTER_REQUIRES_DESTINATION_NODE_ID);
-        this.buffalo.writeUInt8(counter);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.COUNTER_REQUIRES_DESTINATION_NODE_ID);
+        sendBuffalo.writeUInt8(counter);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2024,9 +2031,9 @@ class Ezsp extends events_1.default {
      * @param code uint16_t The manufacturer code for the local node.
      */
     async ezspSetManufacturerCode(code) {
-        this.startCommand(enums_2.EzspFrameID.SET_MANUFACTURER_CODE);
-        this.buffalo.writeUInt16(code);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_MANUFACTURER_CODE);
+        sendBuffalo.writeUInt16(code);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2037,11 +2044,11 @@ class Ezsp extends events_1.default {
      * @returns The manufacturer code for the local node.
      */
     async ezspGetManufacturerCode() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_MANUFACTURER_CODE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_MANUFACTURER_CODE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2056,13 +2063,13 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure. Always `OK` in v13-.
      */
     async ezspSetPowerDescriptor(descriptor) {
-        this.startCommand(enums_2.EzspFrameID.SET_POWER_DESCRIPTOR);
-        this.buffalo.writeUInt16(descriptor);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_POWER_DESCRIPTOR);
+        sendBuffalo.writeUInt16(descriptor);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             return enums_1.SLStatus.OK;
         }
         else {
@@ -2082,9 +2089,9 @@ class Ezsp extends events_1.default {
      * - or the reason for failure.
      */
     async ezspNetworkInit(networkInitStruct) {
-        this.startCommand(enums_2.EzspFrameID.NETWORK_INIT);
-        this.buffalo.writeEmberNetworkInitStruct(networkInitStruct);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.NETWORK_INIT);
+        sendBuffalo.writeEmberNetworkInitStruct(networkInitStruct);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2097,8 +2104,8 @@ class Ezsp extends events_1.default {
      * @returns An EmberNetworkStatus value indicating the current join status.
      */
     async ezspNetworkState() {
-        this.startCommand(enums_2.EzspFrameID.NETWORK_STATE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.NETWORK_STATE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2138,11 +2145,11 @@ class Ezsp extends events_1.default {
      * - SLStatus.INVALID_CHANNEL_MASK, our channel mask did not specify any valid channels.
      */
     async ezspStartScan(scanType, channelMask, duration) {
-        this.startCommand(enums_2.EzspFrameID.START_SCAN);
-        this.buffalo.writeUInt8(scanType);
-        this.buffalo.writeUInt32(channelMask);
-        this.buffalo.writeUInt8(duration);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.START_SCAN);
+        sendBuffalo.writeUInt8(scanType);
+        sendBuffalo.writeUInt32(channelMask);
+        sendBuffalo.writeUInt8(duration);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2169,8 +2176,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) {
-        logger_1.logger.debug(`ezspNetworkFoundHandler(): callback called with: [networkFound=${JSON.stringify(networkFound)}], `
-            + `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}]`, NS);
+        logger_1.logger.debug(`ezspNetworkFoundHandler(): callback called with: [networkFound=${JSON.stringify(networkFound)}], ` +
+            `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}]`, NS);
     }
     /**
      * Callback
@@ -2198,10 +2205,10 @@ class Ezsp extends events_1.default {
      * @returns The error condition that occurred during the scan. Value will be SLStatus.OK if there are no errors.
      */
     async ezspFindUnusedPanId(channelMask, duration) {
-        this.startCommand(enums_2.EzspFrameID.FIND_UNUSED_PAN_ID);
-        this.buffalo.writeUInt32(channelMask);
-        this.buffalo.writeUInt8(duration);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.FIND_UNUSED_PAN_ID);
+        sendBuffalo.writeUInt32(channelMask);
+        sendBuffalo.writeUInt8(duration);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2213,8 +2220,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspStopScan() {
-        this.startCommand(enums_2.EzspFrameID.STOP_SCAN);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.STOP_SCAN);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2227,9 +2234,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspFormNetwork(parameters) {
-        this.startCommand(enums_2.EzspFrameID.FORM_NETWORK);
-        this.buffalo.writeEmberNetworkParameters(parameters);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.FORM_NETWORK);
+        sendBuffalo.writeEmberNetworkParameters(parameters);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2247,10 +2254,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspJoinNetwork(nodeType, parameters) {
-        this.startCommand(enums_2.EzspFrameID.JOIN_NETWORK);
-        this.buffalo.writeUInt8(nodeType);
-        this.buffalo.writeEmberNetworkParameters(parameters);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.JOIN_NETWORK);
+        sendBuffalo.writeUInt8(nodeType);
+        sendBuffalo.writeEmberNetworkParameters(parameters);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2275,12 +2282,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspJoinNetworkDirectly(localNodeType, beacon, radioTxPower, clearBeaconsAfterNetworkUp) {
-        this.startCommand(enums_2.EzspFrameID.JOIN_NETWORK_DIRECTLY);
-        this.buffalo.writeUInt8(localNodeType);
-        this.buffalo.writeEmberBeaconData(beacon);
-        this.buffalo.writeInt8(radioTxPower);
-        this.buffalo.writeUInt8(clearBeaconsAfterNetworkUp ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.JOIN_NETWORK_DIRECTLY);
+        sendBuffalo.writeUInt8(localNodeType);
+        sendBuffalo.writeEmberBeaconData(beacon);
+        sendBuffalo.writeInt8(radioTxPower);
+        sendBuffalo.writeUInt8(clearBeaconsAfterNetworkUp ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2295,11 +2302,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspLeaveNetwork(options = enums_1.EmberLeaveNetworkOption.WITH_NO_OPTION) {
-        this.startCommand(enums_2.EzspFrameID.LEAVE_NETWORK);
-        if (this.version >= 0x0E) {
-            this.buffalo.writeUInt8(options);
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.LEAVE_NETWORK);
+        if (this.version >= 0x0e) {
+            sendBuffalo.writeUInt8(options);
         }
-        const sendStatus = await this.sendCommand();
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2329,15 +2336,15 @@ class Ezsp extends events_1.default {
      *        This value could be set to 0 or SL_ZIGBEE_DEVICE_TYPE_UNCHANGED if not needed.
      * @returns An SLStatus value indicating success or the reason for failure.
      */
-    async ezspFindAndRejoinNetwork(haveCurrentNetworkKey, channelMask, reason = 0xFF, nodeType = 0) {
-        this.startCommand(enums_2.EzspFrameID.FIND_AND_REJOIN_NETWORK);
-        this.buffalo.writeUInt8(haveCurrentNetworkKey ? 1 : 0);
-        this.buffalo.writeUInt32(channelMask);
-        if (this.version >= 0x0E) {
-            this.buffalo.writeUInt8(reason);
-            this.buffalo.writeUInt8(nodeType);
+    async ezspFindAndRejoinNetwork(haveCurrentNetworkKey, channelMask, reason = 0xff, nodeType = 0) {
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.FIND_AND_REJOIN_NETWORK);
+        sendBuffalo.writeUInt8(haveCurrentNetworkKey ? 1 : 0);
+        sendBuffalo.writeUInt32(channelMask);
+        if (this.version >= 0x0e) {
+            sendBuffalo.writeUInt8(reason);
+            sendBuffalo.writeUInt8(nodeType);
         }
-        const sendStatus = await this.sendCommand();
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2352,9 +2359,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspPermitJoining(duration) {
-        this.startCommand(enums_2.EzspFrameID.PERMIT_JOINING);
-        this.buffalo.writeUInt8(duration);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.PERMIT_JOINING);
+        sendBuffalo.writeUInt8(duration);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2371,8 +2378,8 @@ class Ezsp extends events_1.default {
      * @param childType The node type of the child.
      */
     ezspChildJoinHandler(index, joining, childId, childEui64, childType) {
-        logger_1.logger.debug(`ezspChildJoinHandler(): callback called with: [index=${index}], [joining=${joining}], `
-            + `[childId=${childId}], [childEui64=${childEui64}], [childType=${childType}]`, NS);
+        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
@@ -2387,12 +2394,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspEnergyScanRequest(target, scanChannels, scanDuration, scanCount) {
-        this.startCommand(enums_2.EzspFrameID.ENERGY_SCAN_REQUEST);
-        this.buffalo.writeUInt16(target);
-        this.buffalo.writeUInt32(scanChannels);
-        this.buffalo.writeUInt8(scanDuration);
-        this.buffalo.writeUInt16(scanCount);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ENERGY_SCAN_REQUEST);
+        sendBuffalo.writeUInt16(target);
+        sendBuffalo.writeUInt32(scanChannels);
+        sendBuffalo.writeUInt8(scanDuration);
+        sendBuffalo.writeUInt16(scanCount);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2406,8 +2413,8 @@ class Ezsp extends events_1.default {
      * @returns EmberNetworkParameters * The current network parameters.
      */
     async ezspGetNetworkParameters() {
-        this.startCommand(enums_2.EzspFrameID.GET_NETWORK_PARAMETERS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_NETWORK_PARAMETERS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2423,9 +2430,9 @@ class Ezsp extends events_1.default {
      * @returns EmberMultiPhyRadioParameters * The current radio parameters based on provided phy index.
      */
     async ezspGetRadioParameters(phyIndex) {
-        this.startCommand(enums_2.EzspFrameID.GET_RADIO_PARAMETERS);
-        this.buffalo.writeUInt8(phyIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_RADIO_PARAMETERS);
+        sendBuffalo.writeUInt8(phyIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2442,8 +2449,8 @@ class Ezsp extends events_1.default {
      *          (coordinators and nodes that are not joined to a network).
      */
     async ezspGetParentChildParameters() {
-        this.startCommand(enums_2.EzspFrameID.GET_PARENT_CHILD_PARAMETERS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_PARENT_CHILD_PARAMETERS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2457,11 +2464,11 @@ class Ezsp extends events_1.default {
      * @returns The number of router children.
      */
     async ezspRouterChildCount() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.ROUTER_CHILD_COUNT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ROUTER_CHILD_COUNT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2474,11 +2481,11 @@ class Ezsp extends events_1.default {
      * @returns The maximum number of children.
      */
     async ezspMaxChildCount() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MAX_CHILD_COUNT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MAX_CHILD_COUNT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2491,11 +2498,11 @@ class Ezsp extends events_1.default {
      * @returns The maximum number of router children.
      */
     async ezspMaxRouterChildCount() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MAX_ROUTER_CHILD_COUNT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MAX_ROUTER_CHILD_COUNT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2507,11 +2514,11 @@ class Ezsp extends events_1.default {
      * @returns
      */
     async ezspGetParentIncomingNwkFrameCounter() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_PARENT_INCOMING_NWK_FRAME_COUNTER);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_PARENT_INCOMING_NWK_FRAME_COUNTER);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2524,12 +2531,12 @@ class Ezsp extends events_1.default {
      * @returns
      */
     async ezspSetParentIncomingNwkFrameCounter(value) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_PARENT_INCOMING_NWK_FRAME_COUNTER);
-        this.buffalo.writeUInt32(value);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_PARENT_INCOMING_NWK_FRAME_COUNTER);
+        sendBuffalo.writeUInt32(value);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2547,11 +2554,11 @@ class Ezsp extends events_1.default {
      * @returns A bitmask of the stack's active tasks.
      */
     async ezspCurrentStackTasks() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.CURRENT_STACK_TASKS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CURRENT_STACK_TASKS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2566,11 +2573,11 @@ class Ezsp extends events_1.default {
      * @returns True if the application may sleep but the stack may be expecting incoming messages.
      */
     async ezspOkToNap() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.OK_TO_NAP);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.OK_TO_NAP);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2582,11 +2589,11 @@ class Ezsp extends events_1.default {
      * @returns True if the parent token has been set.
      */
     async ezspParentTokenSet() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.PARENT_TOKEN_SET);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.PARENT_TOKEN_SET);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2600,11 +2607,11 @@ class Ezsp extends events_1.default {
      * @returns True if the application may sleep for as long as it wishes.
      */
     async ezspOkToHibernate() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.OK_TO_HIBERNATE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.OK_TO_HIBERNATE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2616,11 +2623,11 @@ class Ezsp extends events_1.default {
      * @returns True if the device may poll less frequently.
      */
     async ezspOkToLongPoll() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.OK_TO_LONG_POLL);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.OK_TO_LONG_POLL);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2631,11 +2638,11 @@ class Ezsp extends events_1.default {
      * Calling this function will render all other stack functions except ezspStackPowerUp() non-functional until the radio is powered back on.
      */
     async ezspStackPowerDown() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.STACK_POWER_DOWN);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.STACK_POWER_DOWN);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2645,11 +2652,11 @@ class Ezsp extends events_1.default {
      * For non-sleepy devices, also turns the radio on and leaves it in RX mode.
      */
     async ezspStackPowerUp() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.STACK_POWER_UP);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.STACK_POWER_UP);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2663,9 +2670,9 @@ class Ezsp extends events_1.default {
      * @returns EmberChildData * The data of the child.
      */
     async ezspGetChildData(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_CHILD_DATA);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_CHILD_DATA);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2682,10 +2689,10 @@ class Ezsp extends events_1.default {
      * - SLStatus.INVALID_INDEX if provided index is out of range.
      */
     async ezspSetChildData(index, childData) {
-        this.startCommand(enums_2.EzspFrameID.SET_CHILD_DATA);
-        this.buffalo.writeUInt8(index);
-        this.buffalo.writeEmberChildData(childData);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_CHILD_DATA);
+        sendBuffalo.writeUInt8(index);
+        sendBuffalo.writeEmberChildData(childData);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2698,9 +2705,9 @@ class Ezsp extends events_1.default {
      * @returns The node ID of the child or EMBER_NULL_NODE_ID if there isn't a child at the childIndex specified
      */
     async ezspChildId(childIndex) {
-        this.startCommand(enums_2.EzspFrameID.CHILD_ID);
-        this.buffalo.writeUInt8(childIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CHILD_ID);
+        sendBuffalo.writeUInt8(childIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2715,12 +2722,12 @@ class Ezsp extends events_1.default {
      *          while forming/joining a network if there isn't a child at the childIndex specified
      */
     async ezspChilPower(childIndex) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.CHILD_POWER);
-        this.buffalo.writeUInt8(childIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CHILD_POWER);
+        sendBuffalo.writeUInt8(childIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2733,13 +2740,13 @@ class Ezsp extends events_1.default {
      * @param newPower int8_t
      */
     async ezspSetChildPower(childIndex, newPower) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_CHILD_POWER);
-        this.buffalo.writeUInt8(childIndex);
-        this.buffalo.writeInt8(newPower);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_CHILD_POWER);
+        sendBuffalo.writeUInt8(childIndex);
+        sendBuffalo.writeInt8(newPower);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2750,9 +2757,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The child index or 0xFF if the node ID doesn't belong to a child
      */
     async ezspChildIndex(childId) {
-        this.startCommand(enums_2.EzspFrameID.CHILD_INDEX);
-        this.buffalo.writeUInt16(childId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CHILD_INDEX);
+        sendBuffalo.writeUInt16(childId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2764,8 +2771,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t Total size of source route table.
      */
     async ezspGetSourceRouteTableTotalSize() {
-        this.startCommand(enums_2.EzspFrameID.GET_SOURCE_ROUTE_TABLE_TOTAL_SIZE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_SOURCE_ROUTE_TABLE_TOTAL_SIZE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2777,8 +2784,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The number of filled entries in source route table.
      */
     async ezspGetSourceRouteTableFilledSize() {
-        this.startCommand(enums_2.EzspFrameID.GET_SOURCE_ROUTE_TABLE_FILLED_SIZE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_SOURCE_ROUTE_TABLE_FILLED_SIZE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2796,9 +2803,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The closer node index for this source route table entry
      */
     async ezspGetSourceRouteTableEntry(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_SOURCE_ROUTE_TABLE_ENTRY);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_SOURCE_ROUTE_TABLE_ENTRY);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2818,9 +2825,9 @@ class Ezsp extends events_1.default {
      * @returns EmberNeighborTableEntry * The contents of the neighbor table entry.
      */
     async ezspGetNeighbor(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_NEIGHBOR);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_NEIGHBOR);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2840,9 +2847,9 @@ class Ezsp extends events_1.default {
      * @returns uint32_t * Return the frame counter of the node from the neighbor or child table
      */
     async ezspGetNeighborFrameCounter(eui64) {
-        this.startCommand(enums_2.EzspFrameID.GET_NEIGHBOR_FRAME_COUNTER);
-        this.buffalo.writeIeeeAddr(eui64);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_NEIGHBOR_FRAME_COUNTER);
+        sendBuffalo.writeIeeeAddr(eui64);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2859,10 +2866,10 @@ class Ezsp extends events_1.default {
      * - SLStatus.OK otherwise
      */
     async ezspSetNeighborFrameCounter(eui64, frameCounter) {
-        this.startCommand(enums_2.EzspFrameID.SET_NEIGHBOR_FRAME_COUNTER);
-        this.buffalo.writeIeeeAddr(eui64);
-        this.buffalo.writeUInt32(frameCounter);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_NEIGHBOR_FRAME_COUNTER);
+        sendBuffalo.writeIeeeAddr(eui64);
+        sendBuffalo.writeUInt32(frameCounter);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2876,9 +2883,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetRoutingShortcutThreshold(costThresh) {
-        this.startCommand(enums_2.EzspFrameID.SET_ROUTING_SHORTCUT_THRESHOLD);
-        this.buffalo.writeUInt8(costThresh);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_ROUTING_SHORTCUT_THRESHOLD);
+        sendBuffalo.writeUInt8(costThresh);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2891,8 +2898,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The routing shortcut threshold
      */
     async ezspGetRoutingShortcutThreshold() {
-        this.startCommand(enums_2.EzspFrameID.GET_ROUTING_SHORTCUT_THRESHOLD);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ROUTING_SHORTCUT_THRESHOLD);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2904,8 +2911,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The number of active entries in the neighbor table.
      */
     async ezspNeighborCount() {
-        this.startCommand(enums_2.EzspFrameID.NEIGHBOR_COUNT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.NEIGHBOR_COUNT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2922,9 +2929,9 @@ class Ezsp extends events_1.default {
      * @returns EmberRouteTableEntry * The contents of the route table entry.
      */
     async ezspGetRouteTableEntry(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_ROUTE_TABLE_ENTRY);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ROUTE_TABLE_ENTRY);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2944,9 +2951,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating the success or failure of the command.
      */
     async ezspSetRadioPower(power) {
-        this.startCommand(enums_2.EzspFrameID.SET_RADIO_POWER);
-        this.buffalo.writeInt8(power);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_RADIO_POWER);
+        sendBuffalo.writeInt8(power);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2962,9 +2969,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating the success or failure of the command.
      */
     async ezspSetRadioChannel(channel) {
-        this.startCommand(enums_2.EzspFrameID.SET_RADIO_CHANNEL);
-        this.buffalo.writeUInt8(channel);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_RADIO_CHANNEL);
+        sendBuffalo.writeUInt8(channel);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2976,8 +2983,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t Current radio channel.
      */
     async ezspGetRadioChannel() {
-        this.startCommand(enums_2.EzspFrameID.GET_RADIO_CHANNEL);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_RADIO_CHANNEL);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -2990,9 +2997,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating the success or failure of the command.
      */
     async ezspSetRadioIeee802154CcaMode(ccaMode) {
-        this.startCommand(enums_2.EzspFrameID.SET_RADIO_IEEE802154_CCA_MODE);
-        this.buffalo.writeUInt8(ccaMode);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_RADIO_IEEE802154_CCA_MODE);
+        sendBuffalo.writeUInt8(ccaMode);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3017,15 +3024,15 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetConcentrator(on, concentratorType, minTime, maxTime, routeErrorThreshold, deliveryFailureThreshold, maxHops) {
-        this.startCommand(enums_2.EzspFrameID.SET_CONCENTRATOR);
-        this.buffalo.writeUInt8(on ? 1 : 0);
-        this.buffalo.writeUInt16(concentratorType);
-        this.buffalo.writeUInt16(minTime);
-        this.buffalo.writeUInt16(maxTime);
-        this.buffalo.writeUInt8(routeErrorThreshold);
-        this.buffalo.writeUInt8(deliveryFailureThreshold);
-        this.buffalo.writeUInt8(maxHops);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_CONCENTRATOR);
+        sendBuffalo.writeUInt8(on ? 1 : 0);
+        sendBuffalo.writeUInt16(concentratorType);
+        sendBuffalo.writeUInt16(minTime);
+        sendBuffalo.writeUInt16(maxTime);
+        sendBuffalo.writeUInt8(routeErrorThreshold);
+        sendBuffalo.writeUInt8(deliveryFailureThreshold);
+        sendBuffalo.writeUInt8(maxHops);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3038,11 +3045,11 @@ class Ezsp extends events_1.default {
      * has been stopped by a call to ::ezspConcentratorStopDiscovery().
      */
     async ezspConcentratorStartDiscovery() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.CONCENTRATOR_START_DISCOVERY);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CONCENTRATOR_START_DISCOVERY);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3051,11 +3058,11 @@ class Ezsp extends events_1.default {
      * Stops periodic many-to-one route discovery.
      */
     async ezspConcentratorStopDiscovery() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.CONCENTRATOR_STOP_DISCOVERY);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CONCENTRATOR_STOP_DISCOVERY);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3066,13 +3073,13 @@ class Ezsp extends events_1.default {
      * @param nodeId
      */
     async ezspConcentratorNoteRouteError(status, nodeId) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.CONCENTRATOR_NOTE_ROUTE_ERROR);
-        this.buffalo.writeUInt32(status);
-        this.buffalo.writeUInt16(nodeId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CONCENTRATOR_NOTE_ROUTE_ERROR);
+        sendBuffalo.writeUInt32(status);
+        sendBuffalo.writeUInt16(nodeId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3083,9 +3090,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating the success or failure of the command.
      */
     async ezspSetBrokenRouteErrorCode(errorCode) {
-        this.startCommand(enums_2.EzspFrameID.SET_BROKEN_ROUTE_ERROR_CODE);
-        this.buffalo.writeUInt8(errorCode);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_BROKEN_ROUTE_ERROR_CODE);
+        sendBuffalo.writeUInt8(errorCode);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3104,13 +3111,13 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspMultiPhyStart(phyIndex, page, channel, power, bitmask) {
-        this.startCommand(enums_2.EzspFrameID.MULTI_PHY_START);
-        this.buffalo.writeUInt8(phyIndex);
-        this.buffalo.writeUInt8(page);
-        this.buffalo.writeUInt8(channel);
-        this.buffalo.writeInt8(power);
-        this.buffalo.writeUInt8(bitmask);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MULTI_PHY_START);
+        sendBuffalo.writeUInt8(phyIndex);
+        sendBuffalo.writeUInt8(page);
+        sendBuffalo.writeUInt8(channel);
+        sendBuffalo.writeInt8(power);
+        sendBuffalo.writeUInt8(bitmask);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3123,9 +3130,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspMultiPhyStop(phyIndex) {
-        this.startCommand(enums_2.EzspFrameID.MULTI_PHY_STOP);
-        this.buffalo.writeUInt8(phyIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MULTI_PHY_STOP);
+        sendBuffalo.writeUInt8(phyIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3145,10 +3152,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating the success or failure of the command.
      */
     async ezspMultiPhySetRadioPower(phyIndex, power) {
-        this.startCommand(enums_2.EzspFrameID.MULTI_PHY_SET_RADIO_POWER);
-        this.buffalo.writeUInt8(phyIndex);
-        this.buffalo.writeInt8(power);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MULTI_PHY_SET_RADIO_POWER);
+        sendBuffalo.writeUInt8(phyIndex);
+        sendBuffalo.writeInt8(power);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3160,8 +3167,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating the success or failure of the command.
      */
     async ezspSendLinkPowerDeltaRequest() {
-        this.startCommand(enums_2.EzspFrameID.SEND_LINK_POWER_DELTA_REQUEST);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_LINK_POWER_DELTA_REQUEST);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3180,11 +3187,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating the success or failure of the command.
      */
     async ezspMultiPhySetRadioChannel(phyIndex, page, channel) {
-        this.startCommand(enums_2.EzspFrameID.MULTI_PHY_SET_RADIO_CHANNEL);
-        this.buffalo.writeUInt8(phyIndex);
-        this.buffalo.writeUInt8(page);
-        this.buffalo.writeUInt8(channel);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MULTI_PHY_SET_RADIO_CHANNEL);
+        sendBuffalo.writeUInt8(phyIndex);
+        sendBuffalo.writeUInt8(page);
+        sendBuffalo.writeUInt8(channel);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3197,8 +3204,8 @@ class Ezsp extends events_1.default {
      * @returns EmberDutyCycleState * The current duty cycle state in effect.
      */
     async ezspGetDutyCycleState() {
-        this.startCommand(enums_2.EzspFrameID.GET_DUTY_CYCLE_STATE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_DUTY_CYCLE_STATE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3217,9 +3224,9 @@ class Ezsp extends events_1.default {
      * - SLStatus.INVALID_STATE if device is operating on 2.4Ghz
      */
     async ezspSetDutyCycleLimitsInStack(limits) {
-        this.startCommand(enums_2.EzspFrameID.SET_DUTY_CYCLE_LIMITS_IN_STACK);
-        this.buffalo.writeEmberDutyCycleLimits(limits);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_DUTY_CYCLE_LIMITS_IN_STACK);
+        sendBuffalo.writeEmberDutyCycleLimits(limits);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3233,8 +3240,8 @@ class Ezsp extends events_1.default {
      * @returns EmberDutyCycleLimits * Return current duty cycle limits if returnedLimits is not NULL
      */
     async ezspGetDutyCycleLimits() {
-        this.startCommand(enums_2.EzspFrameID.GET_DUTY_CYCLE_LIMITS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_DUTY_CYCLE_LIMITS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3256,9 +3263,9 @@ class Ezsp extends events_1.default {
      *          the NodeId element in the EmberPerDeviceDutyCycle will be 0xFFFF.
      */
     async ezspGetCurrentDutyCycle(maxDevices) {
-        this.startCommand(enums_2.EzspFrameID.GET_CURRENT_DUTY_CYCLE);
-        this.buffalo.writeUInt8(maxDevices);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_CURRENT_DUTY_CYCLE);
+        sendBuffalo.writeUInt8(maxDevices);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3275,10 +3282,10 @@ class Ezsp extends events_1.default {
      * @param totalDevices uint8_t The total number of connected end devices that are being monitored for duty cycle.
      * @param arrayOfDeviceDutyCycles EmberPerDeviceDutyCycle * Consumed duty cycles of end devices that are being monitored.
      *        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) {
-        logger_1.logger.debug(`ezspDutyCycleHandler(): callback called with: [channelPage=${channelPage}], [channel=${channel}], `
-            + `[state=${state}], [totalDevices=${totalDevices}], [arrayOfDeviceDutyCycles=${arrayOfDeviceDutyCycles}]`, NS);
+        logger_1.logger.debug(`ezspDutyCycleHandler(): callback called with: [channelPage=${channelPage}], [channel=${channel}], ` +
+            `[state=${state}], [totalDevices=${totalDevices}], [arrayOfDeviceDutyCycles=${arrayOfDeviceDutyCycles}]`, NS);
     }
     /**
      * Configure the number of beacons to store when issuing active scans for networks.
@@ -3288,12 +3295,12 @@ class Ezsp extends events_1.default {
      * - SLStatus.OK
      */
     async ezspSetNumBeaconToStore(numBeacons) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_NUM_BEACONS_TO_STORE);
-        this.buffalo.writeUInt8(numBeacons);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_NUM_BEACONS_TO_STORE);
+        sendBuffalo.writeUInt8(numBeacons);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3307,12 +3314,12 @@ class Ezsp extends events_1.default {
      * @returns EmberBeaconData * The beacon to populate upon success.
      */
     async ezspGetStoredBeacon(beaconNumber) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_STORED_BEACON);
-        this.buffalo.writeUInt8(beaconNumber);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_STORED_BEACON);
+        sendBuffalo.writeUInt8(beaconNumber);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3325,8 +3332,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The number of cached beacons that have been collected from a scan.
      */
     async ezspGetNumStoredBeacons() {
-        this.startCommand(enums_2.EzspFrameID.GET_NUM_STORED_BEACONS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_NUM_STORED_BEACONS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3338,12 +3345,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure. Always `OK` in v13-.
      */
     async ezspClearStoredBeacons() {
-        this.startCommand(enums_2.EzspFrameID.CLEAR_STORED_BEACONS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CLEAR_STORED_BEACONS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             return enums_1.SLStatus.OK;
         }
         else {
@@ -3358,9 +3365,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetLogicalAndRadioChannel(radioChannel) {
-        this.startCommand(enums_2.EzspFrameID.SET_LOGICAL_AND_RADIO_CHANNEL);
-        this.buffalo.writeUInt8(radioChannel);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_LOGICAL_AND_RADIO_CHANNEL);
+        sendBuffalo.writeUInt8(radioChannel);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3375,13 +3382,13 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or a reason for failure.
      */
     async ezspSleepyToSleepyNetworkStart(parameters, initiator) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SLEEPY_TO_SLEEPY_NETWORK_START);
-        this.buffalo.writeEmberNetworkParameters(parameters);
-        this.buffalo.writeUInt8(initiator ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SLEEPY_TO_SLEEPY_NETWORK_START);
+        sendBuffalo.writeEmberNetworkParameters(parameters);
+        sendBuffalo.writeUInt8(initiator ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3395,13 +3402,13 @@ class Ezsp extends events_1.default {
      * @returns Status indicating success or a reason for failure. Call is invalid if destination is on network or is the local node.
      */
     async ezspSendZigbeeLeave(destination, flags) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SEND_ZIGBEE_LEAVE);
-        this.buffalo.writeUInt16(destination);
-        this.buffalo.writeUInt8(flags);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_ZIGBEE_LEAVE);
+        sendBuffalo.writeUInt16(destination);
+        sendBuffalo.writeUInt8(flags);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3413,11 +3420,11 @@ class Ezsp extends events_1.default {
      * @returns Whether the current network permits joining.
      */
     async ezspGetPermitJoining() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_PERMIT_JOINING);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_PERMIT_JOINING);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3429,11 +3436,11 @@ class Ezsp extends events_1.default {
      * @returns Extended PAN ID of this node. Valid only if it is currently on a network.
      */
     async ezspGetExtendedPanId() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_EXTENDED_PAN_ID);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_EXTENDED_PAN_ID);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3445,11 +3452,11 @@ class Ezsp extends events_1.default {
      * @returns Return the current network index.
      */
     async ezspGetCurrentNetwork() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_CURRENT_NETWORK);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_CURRENT_NETWORK);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3462,12 +3469,12 @@ class Ezsp extends events_1.default {
      * @returns Whether or not initial cost was successfully set.
      */
     async ezspSetInitialNeighborOutgoingCost(cost) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_INITIAL_NEIGHBOR_OUTGOING_COST);
-        this.buffalo.writeUInt8(cost);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_INITIAL_NEIGHBOR_OUTGOING_COST);
+        sendBuffalo.writeUInt8(cost);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3479,11 +3486,11 @@ class Ezsp extends events_1.default {
      * @returns The default cost associated with new neighbor's outgoing links.
      */
     async ezspGetInitialNeighborOutgoingCost() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_INITIAL_NEIGHBOR_OUTGOING_COST);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_INITIAL_NEIGHBOR_OUTGOING_COST);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3495,12 +3502,12 @@ class Ezsp extends events_1.default {
      * @param reset
      */
     async ezspResetRejoiningNeighborsFrameCounter(reset) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.RESET_REJOINING_NEIGHBORS_FRAME_COUNTER);
-        this.buffalo.writeUInt8(reset ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.RESET_REJOINING_NEIGHBORS_FRAME_COUNTER);
+        sendBuffalo.writeUInt8(reset ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3510,11 +3517,11 @@ class Ezsp extends events_1.default {
      * @returns Whether or not a rejoining neighbor's incoming FC gets reset (true or false).
      */
     async ezspIsResetRejoiningNeighborsFrameCounterEnabled() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.IS_RESET_REJOINING_NEIGHBORS_FRAME_COUNTER_ENABLED);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.IS_RESET_REJOINING_NEIGHBORS_FRAME_COUNTER_ENABLED);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3529,8 +3536,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspClearBindingTable() {
-        this.startCommand(enums_2.EzspFrameID.CLEAR_BINDING_TABLE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CLEAR_BINDING_TABLE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3544,10 +3551,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetBinding(index, value) {
-        this.startCommand(enums_2.EzspFrameID.SET_BINDING);
-        this.buffalo.writeUInt8(index);
-        this.buffalo.writeEmberBindingTableEntry(value);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_BINDING);
+        sendBuffalo.writeUInt8(index);
+        sendBuffalo.writeEmberBindingTableEntry(value);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3561,9 +3568,9 @@ class Ezsp extends events_1.default {
      * @returns EmberBindingTableEntry * The contents of the binding entry.
      */
     async ezspGetBinding(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_BINDING);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_BINDING);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3577,9 +3584,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspDeleteBinding(index) {
-        this.startCommand(enums_2.EzspFrameID.DELETE_BINDING);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.DELETE_BINDING);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3595,9 +3602,9 @@ class Ezsp extends events_1.default {
      * @returns True if the binding table entry is active, false otherwise.
      */
     async ezspBindingIsActive(index) {
-        this.startCommand(enums_2.EzspFrameID.BINDING_IS_ACTIVE);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.BINDING_IS_ACTIVE);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3617,9 +3624,9 @@ class Ezsp extends events_1.default {
      * @returns The short ID of the destination node or EMBER_NULL_NODE_ID if no destination is known.
      */
     async ezspGetBindingRemoteNodeId(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_BINDING_REMOTE_NODE_ID);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_BINDING_REMOTE_NODE_ID);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3633,10 +3640,10 @@ class Ezsp extends events_1.default {
      * @param The short ID of the destination node.
      */
     async ezspSetBindingRemoteNodeId(index, nodeId) {
-        this.startCommand(enums_2.EzspFrameID.SET_BINDING_REMOTE_NODE_ID);
-        this.buffalo.writeUInt8(index);
-        this.buffalo.writeUInt16(nodeId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_BINDING_REMOTE_NODE_ID);
+        sendBuffalo.writeUInt8(index);
+        sendBuffalo.writeUInt16(nodeId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3652,8 +3659,8 @@ class Ezsp extends events_1.default {
      * @param policyDecision SLStatus.OK if the binding was added to the table and any other status if not.
      */
     ezspRemoteSetBindingHandler(entry, index, policyDecision) {
-        logger_1.logger.debug(`ezspRemoteSetBindingHandler(): callback called with: [entry=${entry}], [index=${index}], `
-            + `[policyDecision=${enums_1.SLStatus[policyDecision]}]`, NS);
+        logger_1.logger.debug(`ezspRemoteSetBindingHandler(): callback called with: [entry=${JSON.stringify(entry)}], [index=${index}], ` +
+            `[policyDecision=${enums_1.SLStatus[policyDecision]}]`, NS);
     }
     /**
      * Callback
@@ -3675,8 +3682,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The maximum APS payload length.
      */
     async ezspMaximumPayloadLength() {
-        this.startCommand(enums_2.EzspFrameID.MAXIMUM_PAYLOAD_LENGTH);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MAXIMUM_PAYLOAD_LENGTH);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3711,18 +3718,18 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The sequence number that will be used when this message is transmitted.
      */
     async ezspSendUnicast(type, indexOrDestination, apsFrame, messageTag, messageContents) {
-        this.startCommand(enums_2.EzspFrameID.SEND_UNICAST);
-        this.buffalo.writeUInt8(type);
-        this.buffalo.writeUInt16(indexOrDestination);
-        this.buffalo.writeEmberApsFrame(apsFrame);
-        if (this.version < 0x0E) {
-            this.buffalo.writeUInt8(messageTag);
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_UNICAST);
+        sendBuffalo.writeUInt8(type);
+        sendBuffalo.writeUInt16(indexOrDestination);
+        sendBuffalo.writeEmberApsFrame(apsFrame);
+        if (this.version < 0x0e) {
+            sendBuffalo.writeUInt8(messageTag);
         }
         else {
-            this.buffalo.writeUInt16(messageTag);
+            sendBuffalo.writeUInt16(messageTag);
         }
-        this.buffalo.writePayload(messageContents);
-        const sendStatus = await this.sendCommand();
+        sendBuffalo.writePayload(messageContents);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3746,23 +3753,23 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The sequence number that will be used when this message is transmitted.
      */
     async ezspSendBroadcast(alias, destination, nwkSequence, apsFrame, radius, messageTag, messageContents) {
-        this.startCommand(enums_2.EzspFrameID.SEND_BROADCAST);
-        if (this.version < 0x0E) {
-            this.buffalo.writeUInt16(destination);
-            this.buffalo.writeEmberApsFrame(apsFrame);
-            this.buffalo.writeUInt8(radius);
-            this.buffalo.writeUInt8(messageTag);
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_BROADCAST);
+        if (this.version < 0x0e) {
+            sendBuffalo.writeUInt16(destination);
+            sendBuffalo.writeEmberApsFrame(apsFrame);
+            sendBuffalo.writeUInt8(radius);
+            sendBuffalo.writeUInt8(messageTag);
         }
         else {
-            this.buffalo.writeUInt16(alias);
-            this.buffalo.writeUInt16(destination);
-            this.buffalo.writeUInt8(nwkSequence);
-            this.buffalo.writeEmberApsFrame(apsFrame);
-            this.buffalo.writeUInt8(radius);
-            this.buffalo.writeUInt16(messageTag);
+            sendBuffalo.writeUInt16(alias);
+            sendBuffalo.writeUInt16(destination);
+            sendBuffalo.writeUInt8(nwkSequence);
+            sendBuffalo.writeEmberApsFrame(apsFrame);
+            sendBuffalo.writeUInt8(radius);
+            sendBuffalo.writeUInt16(messageTag);
         }
-        this.buffalo.writePayload(messageContents);
-        const sendStatus = await this.sendCommand();
+        sendBuffalo.writePayload(messageContents);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3777,12 +3784,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspProxyNextBroadcastFromLong(euiSource) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.PROXY_NEXT_BROADCAST_FROM_LONG);
-        this.buffalo.writeIeeeAddr(euiSource);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.PROXY_NEXT_BROADCAST_FROM_LONG);
+        sendBuffalo.writeIeeeAddr(euiSource);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3812,21 +3819,21 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The sequence number that will be used when this message is transmitted.
      */
     async ezspSendMulticast(apsFrame, hops, broadcastAddr, alias, nwkSequence, messageTag, messageContents) {
-        this.startCommand(enums_2.EzspFrameID.SEND_MULTICAST);
-        this.buffalo.writeEmberApsFrame(apsFrame);
-        this.buffalo.writeUInt8(hops);
-        if (this.version < 0x0E) {
-            this.buffalo.writeUInt8(ZA_MAX_HOPS); // nonMemberRadius
-            this.buffalo.writeUInt8(messageTag);
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_MULTICAST);
+        sendBuffalo.writeEmberApsFrame(apsFrame);
+        sendBuffalo.writeUInt8(hops);
+        if (this.version < 0x0e) {
+            sendBuffalo.writeUInt8(ZA_MAX_HOPS); // nonMemberRadius
+            sendBuffalo.writeUInt8(messageTag);
         }
         else {
-            this.buffalo.writeUInt16(broadcastAddr);
-            this.buffalo.writeUInt16(alias);
-            this.buffalo.writeUInt8(nwkSequence);
-            this.buffalo.writeUInt16(messageTag);
+            sendBuffalo.writeUInt16(broadcastAddr);
+            sendBuffalo.writeUInt16(alias);
+            sendBuffalo.writeUInt8(nwkSequence);
+            sendBuffalo.writeUInt16(messageTag);
         }
-        this.buffalo.writePayload(messageContents);
-        const sendStatus = await this.sendCommand();
+        sendBuffalo.writePayload(messageContents);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3856,11 +3863,11 @@ class Ezsp extends events_1.default {
      * - SLStatus.OK - The reply was successfully queued for transmission.
      */
     async ezspSendReply(sender, apsFrame, messageContents) {
-        this.startCommand(enums_2.EzspFrameID.SEND_REPLY);
-        this.buffalo.writeUInt16(sender);
-        this.buffalo.writeEmberApsFrame(apsFrame);
-        this.buffalo.writePayload(messageContents);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_REPLY);
+        sendBuffalo.writeUInt16(sender);
+        sendBuffalo.writeEmberApsFrame(apsFrame);
+        sendBuffalo.writePayload(messageContents);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3882,9 +3889,9 @@ class Ezsp extends events_1.default {
      *        for the messageContentsInCallback policy is messageTagAndContentsInCallback.
      */
     ezspMessageSentHandler(status, type, indexOrDestination, apsFrame, messageTag, messageContents = undefined) {
-        logger_1.logger.debug(`ezspMessageSentHandler(): callback called with: [status=${enums_1.SLStatus[status]}], [type=${enums_1.EmberOutgoingMessageType[type]}], `
-            + `[indexOrDestination=${indexOrDestination}], [apsFrame=${JSON.stringify(apsFrame)}], [messageTag=${messageTag}]`
-            + (messageContents ? `, [messageContents=${messageContents.toString('hex')}]` : ''), NS);
+        logger_1.logger.debug(`ezspMessageSentHandler(): callback called with: [status=${enums_1.SLStatus[status]}], [type=${enums_1.EmberOutgoingMessageType[type]}], ` +
+            `[indexOrDestination=${indexOrDestination}], [apsFrame=${JSON.stringify(apsFrame)}], [messageTag=${messageTag}]` +
+            (messageContents ? `, [messageContents=${messageContents.toString('hex')}]` : ''), NS);
         this.emit(EzspEvents.MESSAGE_SENT, status, type, indexOrDestination, apsFrame, messageTag);
     }
     /**
@@ -3925,10 +3932,10 @@ class Ezsp extends events_1.default {
      * - SLStatus.FAIL otherwise.
      */
     async ezspSendManyToOneRouteRequest(concentratorType, radius) {
-        this.startCommand(enums_2.EzspFrameID.SEND_MANY_TO_ONE_ROUTE_REQUEST);
-        this.buffalo.writeUInt16(concentratorType);
-        this.buffalo.writeUInt8(radius);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_MANY_TO_ONE_ROUTE_REQUEST);
+        sendBuffalo.writeUInt16(concentratorType);
+        sendBuffalo.writeUInt8(radius);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3947,11 +3954,11 @@ class Ezsp extends events_1.default {
      * @returns The result of sending the first poll.
      */
     async ezspPollForData(interval, units, failureLimit) {
-        this.startCommand(enums_2.EzspFrameID.POLL_FOR_DATA);
-        this.buffalo.writeUInt16(interval);
-        this.buffalo.writeUInt8(units);
-        this.buffalo.writeUInt8(failureLimit);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.POLL_FOR_DATA);
+        sendBuffalo.writeUInt16(interval);
+        sendBuffalo.writeUInt8(units);
+        sendBuffalo.writeUInt8(failureLimit);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -3980,12 +3987,12 @@ class Ezsp extends events_1.default {
      * - SLStatus.NOT_JOINED - The child identified by childId is not our child.
      */
     async ezspSetMessageFlag(childId) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_MESSAGE_FLAG);
-        this.buffalo.writeUInt16(childId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_MESSAGE_FLAG);
+        sendBuffalo.writeUInt16(childId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4001,12 +4008,12 @@ class Ezsp extends events_1.default {
      * - SLStatus.NOT_JOINED - The child identified by childId is not our child.
      */
     async ezspClearMessageFlag(childId) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.CLEAR_MESSAGE_FLAG);
-        this.buffalo.writeUInt16(childId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CLEAR_MESSAGE_FLAG);
+        sendBuffalo.writeUInt16(childId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4034,14 +4041,14 @@ class Ezsp extends events_1.default {
      * - SLStatus.FAIL - The child was not added to the child/neighbor table.
      */
     async ezspAddChild(shortId, longId, nodeType) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.ADD_CHILD);
-        this.buffalo.writeUInt16(shortId);
-        this.buffalo.writeIeeeAddr(longId);
-        this.buffalo.writeUInt8(nodeType);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ADD_CHILD);
+        sendBuffalo.writeUInt16(shortId);
+        sendBuffalo.writeIeeeAddr(longId);
+        sendBuffalo.writeUInt8(nodeType);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4057,12 +4064,12 @@ class Ezsp extends events_1.default {
      * - SLStatus.FAIL - The node was not found in either of the child or neighbor tables.
      */
     async ezspRemoveChild(childEui64) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.REMOVE_CHILD);
-        this.buffalo.writeIeeeAddr(childEui64);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.REMOVE_CHILD);
+        sendBuffalo.writeIeeeAddr(childEui64);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4076,13 +4083,13 @@ class Ezsp extends events_1.default {
      * @param longId The long ID of the neighbor.
      */
     async ezspRemoveNeighbor(shortId, longId) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.REMOVE_NEIGHBOR);
-        this.buffalo.writeUInt16(shortId);
-        this.buffalo.writeIeeeAddr(longId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.REMOVE_NEIGHBOR);
+        sendBuffalo.writeUInt16(shortId);
+        sendBuffalo.writeIeeeAddr(longId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4098,8 +4105,8 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The incoming message.
      */
     ezspIncomingMessageHandler(type, apsFrame, packetInfo, messageContents) {
-        logger_1.logger.debug(`ezspIncomingMessageHandler(): callback called with: [type=${enums_1.EmberIncomingMessageType[type]}], [apsFrame=${JSON.stringify(apsFrame)}], `
-            + `[packetInfo:${JSON.stringify(packetInfo)}], [messageContents=${messageContents.toString('hex')}]`, NS);
+        logger_1.logger.debug(`ezspIncomingMessageHandler(): callback called with: [type=${enums_1.EmberIncomingMessageType[type]}], [apsFrame=${JSON.stringify(apsFrame)}], ` +
+            `[packetInfo:${JSON.stringify(packetInfo)}], [messageContents=${messageContents.toString('hex')}]`, NS);
         if (apsFrame.profileId === Zdo.ZDO_PROFILE_ID) {
             this.emit(EzspEvents.ZDO_RESPONSE, apsFrame, packetInfo.senderShortId, messageContents);
         }
@@ -4116,9 +4123,9 @@ class Ezsp extends events_1.default {
      * @returns uint32_t Remaining time(ms) until next MTORR broadcast if the mode is on, MAX_INT32U_VALUE if the mode is off
      */
     async ezspSetSourceRouteDiscoveryMode(mode) {
-        this.startCommand(enums_2.EzspFrameID.SET_SOURCE_ROUTE_DISCOVERY_MODE);
-        this.buffalo.writeUInt8(mode);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_SOURCE_ROUTE_DISCOVERY_MODE);
+        sendBuffalo.writeUInt8(mode);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4194,8 +4201,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) {
-        logger_1.logger.debug(`ezspIncomingRouteRecordHandler(): callback called with: [source=${source}], [sourceEui=${sourceEui}], `
-            + `[lastHopLqi=${lastHopLqi}], [lastHopRssi=${lastHopRssi}], [relayCount=${relayCount}], [relayList=${relayList}]`, NS);
+        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
     }
     /**
@@ -4206,11 +4213,11 @@ class Ezsp extends events_1.default {
      * @returns SLStatus.OK if send was successful
      */
     async ezspUnicastCurrentNetworkKey(targetShort, targetLong, parentShortId) {
-        this.startCommand(enums_2.EzspFrameID.UNICAST_CURRENT_NETWORK_KEY);
-        this.buffalo.writeUInt16(targetShort);
-        this.buffalo.writeIeeeAddr(targetLong);
-        this.buffalo.writeUInt16(parentShortId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.UNICAST_CURRENT_NETWORK_KEY);
+        sendBuffalo.writeUInt16(targetShort);
+        sendBuffalo.writeIeeeAddr(targetLong);
+        sendBuffalo.writeUInt16(parentShortId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4227,9 +4234,9 @@ class Ezsp extends events_1.default {
      * @returns True if the address table entry is active, false otherwise.
      */
     async ezspAddressTableEntryIsActive(addressTableIndex) {
-        this.startCommand(enums_2.EzspFrameID.ADDRESS_TABLE_ENTRY_IS_ACTIVE);
-        this.buffalo.writeUInt8(addressTableIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ADDRESS_TABLE_ENTRY_IS_ACTIVE);
+        sendBuffalo.writeUInt8(addressTableIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4252,14 +4259,14 @@ class Ezsp extends events_1.default {
      * - SLStatus.ZIGBEE_ADDRESS_TABLE_ENTRY_IS_ACTIVE otherwise.
      */
     async ezspSetAddressTableInfo(addressTableIndex, eui64, id) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_ADDRESS_TABLE_INFO);
-        this.buffalo.writeUInt8(addressTableIndex);
-        this.buffalo.writeIeeeAddr(eui64);
-        this.buffalo.writeUInt16(id);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_ADDRESS_TABLE_INFO);
+        sendBuffalo.writeUInt8(addressTableIndex);
+        sendBuffalo.writeIeeeAddr(eui64);
+        sendBuffalo.writeUInt16(id);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4281,12 +4288,12 @@ class Ezsp extends events_1.default {
      * @returns The EUI64 of the address table entry is copied to this location.
      */
     async ezspGetAddressTableInfo(addressTableIndex) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_ADDRESS_TABLE_INFO);
-        this.buffalo.writeUInt8(addressTableIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ADDRESS_TABLE_INFO);
+        sendBuffalo.writeUInt8(addressTableIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4311,14 +4318,14 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure. Always `OK` in v13-.
      */
     async ezspSetExtendedTimeout(remoteEui64, extendedTimeout) {
-        this.startCommand(enums_2.EzspFrameID.SET_EXTENDED_TIMEOUT);
-        this.buffalo.writeIeeeAddr(remoteEui64);
-        this.buffalo.writeUInt8(extendedTimeout ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_EXTENDED_TIMEOUT);
+        sendBuffalo.writeIeeeAddr(remoteEui64);
+        sendBuffalo.writeUInt8(extendedTimeout ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             return enums_1.SLStatus.OK;
         }
         else {
@@ -4336,13 +4343,13 @@ class Ezsp extends events_1.default {
      * - SLStatus.FAIL if the normal retry interval will be used.
      */
     async ezspGetExtendedTimeout(remoteEui64) {
-        this.startCommand(enums_2.EzspFrameID.GET_EXTENDED_TIMEOUT);
-        this.buffalo.writeIeeeAddr(remoteEui64);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_EXTENDED_TIMEOUT);
+        sendBuffalo.writeIeeeAddr(remoteEui64);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             const extendedTimeout = this.buffalo.readUInt8() !== 0;
             return extendedTimeout ? enums_1.SLStatus.OK : enums_1.SLStatus.FAIL;
         }
@@ -4373,12 +4380,12 @@ class Ezsp extends events_1.default {
      *          false if the normal retry interval was being used.
      */
     async ezspReplaceAddressTableEntry(addressTableIndex, newEui64, newId, newExtendedTimeout) {
-        this.startCommand(enums_2.EzspFrameID.REPLACE_ADDRESS_TABLE_ENTRY);
-        this.buffalo.writeUInt8(addressTableIndex);
-        this.buffalo.writeIeeeAddr(newEui64);
-        this.buffalo.writeUInt16(newId);
-        this.buffalo.writeUInt8(newExtendedTimeout ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.REPLACE_ADDRESS_TABLE_ENTRY);
+        sendBuffalo.writeUInt8(addressTableIndex);
+        sendBuffalo.writeIeeeAddr(newEui64);
+        sendBuffalo.writeUInt16(newId);
+        sendBuffalo.writeUInt8(newExtendedTimeout ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4395,9 +4402,9 @@ class Ezsp extends events_1.default {
      * @returns The short ID of the node or SL_ZIGBEE_NULL_NODE_ID if the short ID is not known.
      */
     async ezspLookupNodeIdByEui64(eui64) {
-        this.startCommand(enums_2.EzspFrameID.LOOKUP_NODE_ID_BY_EUI64);
-        this.buffalo.writeIeeeAddr(eui64);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.LOOKUP_NODE_ID_BY_EUI64);
+        sendBuffalo.writeIeeeAddr(eui64);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4414,9 +4421,9 @@ class Ezsp extends events_1.default {
      * @returns eui64 The EUI64 of the node.
      */
     async ezspLookupEui64ByNodeId(nodeId) {
-        this.startCommand(enums_2.EzspFrameID.LOOKUP_EUI64_BY_NODE_ID);
-        this.buffalo.writeUInt16(nodeId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.LOOKUP_EUI64_BY_NODE_ID);
+        sendBuffalo.writeUInt16(nodeId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4431,9 +4438,9 @@ class Ezsp extends events_1.default {
      * @returns EmberMulticastTableEntry * The contents of the multicast entry.
      */
     async ezspGetMulticastTableEntry(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_MULTICAST_TABLE_ENTRY);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_MULTICAST_TABLE_ENTRY);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4448,10 +4455,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetMulticastTableEntry(index, value) {
-        this.startCommand(enums_2.EzspFrameID.SET_MULTICAST_TABLE_ENTRY);
-        this.buffalo.writeUInt8(index);
-        this.buffalo.writeEmberMulticastTableEntry(value);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_MULTICAST_TABLE_ENTRY);
+        sendBuffalo.writeUInt8(index);
+        sendBuffalo.writeEmberMulticastTableEntry(value);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4481,9 +4488,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspWriteNodeData(erase) {
-        this.startCommand(enums_2.EzspFrameID.WRITE_NODE_DATA);
-        this.buffalo.writeUInt8(erase ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.WRITE_NODE_DATA);
+        sendBuffalo.writeUInt8(erase ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4499,11 +4506,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSendRawMessage(messageContents, priority, useCca) {
-        this.startCommand(enums_2.EzspFrameID.SEND_RAW_MESSAGE);
-        this.buffalo.writePayload(messageContents);
-        this.buffalo.writeUInt8(priority);
-        this.buffalo.writeUInt8(useCca ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_RAW_MESSAGE);
+        sendBuffalo.writePayload(messageContents);
+        sendBuffalo.writeUInt8(priority);
+        sendBuffalo.writeUInt8(useCca ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4519,8 +4526,8 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The raw message that was received.
      */
     ezspMacPassthroughMessageHandler(messageType, packetInfo, messageContents) {
-        logger_1.logger.debug(`ezspMacPassthroughMessageHandler(): callback called with: [messageType=${messageType}], `
-            + `[packetInfo=${JSON.stringify(packetInfo)}], [messageContents=${messageContents.toString('hex')}]`, NS);
+        logger_1.logger.debug(`ezspMacPassthroughMessageHandler(): callback called with: [messageType=${messageType}], ` +
+            `[packetInfo=${JSON.stringify(packetInfo)}], [messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * Callback
@@ -4532,21 +4539,21 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The raw message that was received.
      */
     ezspMacFilterMatchMessageHandler(filterIndexMatch, legacyPassthroughType, packetInfo, messageContents) {
-        logger_1.logger.debug(`ezspMacFilterMatchMessageHandler(): callback called with: [filterIndexMatch=${filterIndexMatch}], `
-            + `[legacyPassthroughType=${legacyPassthroughType}], [packetInfo=${JSON.stringify(packetInfo)}], `
-            + `[messageContents=${messageContents.toString('hex')}]`, NS);
+        logger_1.logger.debug(`ezspMacFilterMatchMessageHandler(): callback called with: [filterIndexMatch=${filterIndexMatch}], ` +
+            `[legacyPassthroughType=${legacyPassthroughType}], [packetInfo=${JSON.stringify(packetInfo)}], ` +
+            `[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);
+        const macFrameControl = msgBuffalo.readUInt16() & ~consts_1.MAC_ACK_REQUIRED;
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const sequence = msgBuffalo.readUInt8();
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const destPanId = msgBuffalo.readUInt16();
         let destAddress;
-        if (macFrameControl === consts_2.LONG_DEST_FRAME_CONTROL) {
+        if (macFrameControl === consts_1.LONG_DEST_FRAME_CONTROL) {
             destAddress = msgBuffalo.readIeeeAddr();
         }
-        else if (macFrameControl === consts_2.SHORT_DEST_FRAME_CONTROL) {
+        else if (macFrameControl === consts_1.SHORT_DEST_FRAME_CONTROL) {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             destAddress = msgBuffalo.readUInt16();
         }
@@ -4558,35 +4565,35 @@ class Ezsp extends events_1.default {
         const sourceAddress = msgBuffalo.readIeeeAddr();
         // 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)) {
+        if (remainingLength < consts_1.STUB_NWK_SIZE + consts_1.MIN_STUB_APS_SIZE) {
             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) {
+        if (nwkFrameControl !== consts_1.STUB_NWK_FRAME_CONTROL) {
             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) {
+        if ((apsFrameControl & ~consts_1.INTERPAN_APS_FRAME_DELIVERY_MODE_MASK & ~consts_1.INTERPAN_APS_FRAME_SECURITY) !==
+            consts_1.INTERPAN_APS_FRAME_CONTROL_NO_DELIVERY_MODE) {
             logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN apsFrameControl "${apsFrameControl}".`, NS);
             return;
         }
-        const messageType = (apsFrameControl & consts_2.INTERPAN_APS_FRAME_DELIVERY_MODE_MASK);
+        const messageType = apsFrameControl & consts_1.INTERPAN_APS_FRAME_DELIVERY_MODE_MASK;
         let groupId = null;
         switch (messageType) {
             case enums_1.EmberInterpanMessageType.UNICAST:
             case enums_1.EmberInterpanMessageType.BROADCAST: {
-                if (remainingLength < consts_2.INTERPAN_APS_UNICAST_BROADCAST_SIZE) {
+                if (remainingLength < consts_1.INTERPAN_APS_UNICAST_BROADCAST_SIZE) {
                     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) {
+                if (remainingLength < consts_1.INTERPAN_APS_MULTICAST_SIZE) {
                     logger_1.logger.debug(`ezspMacFilterMatchMessageHandler INVALID InterPAN length "${remainingLength}".`, NS);
                     return;
                 }
@@ -4615,8 +4622,8 @@ class Ezsp extends events_1.default {
      * - SLStatus.ZIGBEE_DELIVERY_FAILED if not
      */
     ezspRawTransmitCompleteHandler(messageContents, status) {
-        logger_1.logger.debug(`ezspRawTransmitCompleteHandler(): callback called with: [messageContents=${messageContents.toString('hex')}], `
-            + `[status=${enums_1.SLStatus[status]}]`, NS);
+        logger_1.logger.debug(`ezspRawTransmitCompleteHandler(): callback called with: [messageContents=${messageContents.toString('hex')}], ` +
+            `[status=${enums_1.SLStatus[status]}]`, NS);
     }
     /**
      * This function is useful to sleepy end devices.
@@ -4627,9 +4634,9 @@ class Ezsp extends events_1.default {
      *        a data poll when a MAC level data poll fails for any reason.
      */
     async ezspSetMacPollFailureWaitTime(waitBeforeRetryIntervalMs) {
-        this.startCommand(enums_2.EzspFrameID.SET_MAC_POLL_FAILURE_WAIT_TIME);
-        this.buffalo.writeUInt32(waitBeforeRetryIntervalMs);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_MAC_POLL_FAILURE_WAIT_TIME);
+        sendBuffalo.writeUInt32(waitBeforeRetryIntervalMs);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4639,11 +4646,11 @@ class Ezsp extends events_1.default {
      * @returns Max MAC retries
      */
     async ezspGetMaxMacRetries() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.GET_MAX_MAC_RETRIES);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_MAX_MAC_RETRIES);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4656,9 +4663,9 @@ class Ezsp extends events_1.default {
      * @returns The attempt to set the parameters returns SLStatus.OK
      */
     async ezspSetBeaconClassificationParams(param) {
-        this.startCommand(enums_2.EzspFrameID.SET_BEACON_CLASSIFICATION_PARAMS);
-        this.buffalo.writeEmberBeaconClassificationParams(param);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_BEACON_CLASSIFICATION_PARAMS);
+        sendBuffalo.writeEmberBeaconClassificationParams(param);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4671,8 +4678,8 @@ class Ezsp extends events_1.default {
      * @returns EmberBeaconClassificationParams * Gets the beacon prioritization related variable
      */
     async ezspGetBeaconClassificationParams() {
-        this.startCommand(enums_2.EzspFrameID.GET_BEACON_CLASSIFICATION_PARAMS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_BEACON_CLASSIFICATION_PARAMS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4685,11 +4692,11 @@ class Ezsp extends events_1.default {
      * @returns True if there is a pending message for this network in the APS retry queue, false if not.
      */
     async ezspPendingAckedMessages() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.PENDING_ACKED_MESSAGES);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.PENDING_ACKED_MESSAGES);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4701,11 +4708,11 @@ class Ezsp extends events_1.default {
      * @returns
      */
     async ezspRescheduleLinkStatusMsg() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.RESCHEDULE_LINK_STATUS_MSG);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.RESCHEDULE_LINK_STATUS_MSG);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4719,13 +4726,13 @@ class Ezsp extends events_1.default {
      * @returns Status of set operation for the network update ID.
      */
     async ezspSetNwkUpdateId(nwkUpdateId, setWhenOnNetwork) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_NWK_UPDATE_ID);
-        this.buffalo.writeUInt8(nwkUpdateId);
-        this.buffalo.writeUInt8(setWhenOnNetwork ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_NWK_UPDATE_ID);
+        sendBuffalo.writeUInt8(nwkUpdateId);
+        sendBuffalo.writeUInt8(setWhenOnNetwork ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4744,9 +4751,9 @@ class Ezsp extends events_1.default {
      * @returns The success or failure code of the operation.
      */
     async ezspSetInitialSecurityState(state) {
-        this.startCommand(enums_2.EzspFrameID.SET_INITIAL_SECURITY_STATE);
-        this.buffalo.writeEmberInitialSecurityState(state);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_INITIAL_SECURITY_STATE);
+        sendBuffalo.writeEmberInitialSecurityState(state);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4760,8 +4767,8 @@ class Ezsp extends events_1.default {
      * @returns EmberCurrentSecurityState * The security configuration in use by the stack.
      */
     async ezspGetCurrentSecurityState() {
-        this.startCommand(enums_2.EzspFrameID.GET_CURRENT_SECURITY_STATE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_CURRENT_SECURITY_STATE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4820,13 +4827,13 @@ class Ezsp extends events_1.default {
             logger_1.logger.error(`ezspExportKey cannot use INTERNAL key type.`, NS);
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_CALL);
         }
-        this.startCommand(enums_2.EzspFrameID.EXPORT_KEY);
-        this.buffalo.writeSecManContext(context);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.EXPORT_KEY);
+        sendBuffalo.writeSecManContext(context);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             const key = this.buffalo.readSecManKey();
             const status = this.buffalo.readUInt32();
             return [status, key];
@@ -4887,10 +4894,10 @@ class Ezsp extends events_1.default {
             logger_1.logger.error(`ezspImportKey cannot use INTERNAL key type.`, NS);
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_CALL);
         }
-        this.startCommand(enums_2.EzspFrameID.IMPORT_KEY);
-        this.buffalo.writeSecManContext(context);
-        this.buffalo.writeSecManKey(key);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.IMPORT_KEY);
+        sendBuffalo.writeSecManContext(context);
+        sendBuffalo.writeSecManKey(key);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4918,10 +4925,10 @@ class Ezsp extends events_1.default {
      *          A value of 0xFF is returned if not matching entry is found.
      */
     async ezspFindKeyTableEntry(address, linkKey) {
-        this.startCommand(enums_2.EzspFrameID.FIND_KEY_TABLE_ENTRY);
-        this.buffalo.writeIeeeAddr(address);
-        this.buffalo.writeUInt8(linkKey ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.FIND_KEY_TABLE_ENTRY);
+        sendBuffalo.writeIeeeAddr(address);
+        sendBuffalo.writeUInt8(linkKey ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4937,10 +4944,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success of failure of the operation
      */
     async ezspSendTrustCenterLinkKey(destinationNodeId, destinationEui64) {
-        this.startCommand(enums_2.EzspFrameID.SEND_TRUST_CENTER_LINK_KEY);
-        this.buffalo.writeUInt16(destinationNodeId);
-        this.buffalo.writeIeeeAddr(destinationEui64);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_TRUST_CENTER_LINK_KEY);
+        sendBuffalo.writeUInt16(destinationNodeId);
+        sendBuffalo.writeIeeeAddr(destinationEui64);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4954,9 +4961,9 @@ class Ezsp extends events_1.default {
      * @returns The success or failure of the operation.
      */
     async ezspEraseKeyTableEntry(index) {
-        this.startCommand(enums_2.EzspFrameID.ERASE_KEY_TABLE_ENTRY);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ERASE_KEY_TABLE_ENTRY);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4968,8 +4975,8 @@ class Ezsp extends events_1.default {
      * @returns The success or failure of the operation.
      */
     async ezspClearKeyTable() {
-        this.startCommand(enums_2.EzspFrameID.CLEAR_KEY_TABLE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CLEAR_KEY_TABLE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -4996,9 +5003,9 @@ class Ezsp extends events_1.default {
      *          This is not the final result of the attempt. ezspZigbeeKeyEstablishmentHandler(...) will return that.
      */
     async ezspRequestLinkKey(partner) {
-        this.startCommand(enums_2.EzspFrameID.REQUEST_LINK_KEY);
-        this.buffalo.writeIeeeAddr(partner);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.REQUEST_LINK_KEY);
+        sendBuffalo.writeIeeeAddr(partner);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5018,9 +5025,9 @@ class Ezsp extends events_1.default {
      *          will be called at a later time with a final status result.
      */
     async ezspUpdateTcLinkKey(maxAttempts) {
-        this.startCommand(enums_2.EzspFrameID.UPDATE_TC_LINK_KEY);
-        this.buffalo.writeUInt8(maxAttempts);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.UPDATE_TC_LINK_KEY);
+        sendBuffalo.writeUInt8(maxAttempts);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5044,8 +5051,8 @@ class Ezsp extends events_1.default {
      * Clear all of the transient link keys from RAM.
      */
     async ezspClearTransientLinkKeys() {
-        this.startCommand(enums_2.EzspFrameID.CLEAR_TRANSIENT_LINK_KEYS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CLEAR_TRANSIENT_LINK_KEYS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5067,8 +5074,8 @@ class Ezsp extends events_1.default {
          * @return SLStatus SLStatus.OK
          *
          */
-        this.startCommand(enums_2.EzspFrameID.GET_NETWORK_KEY_INFO);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_NETWORK_KEY_INFO);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5118,13 +5125,13 @@ class Ezsp extends events_1.default {
          *  EMBER_GET_PRECONFIGURED_KEY_FROM_INSTALL_CODE have not been set in the
          *  initial security state).
          */
-        this.startCommand(enums_2.EzspFrameID.GET_APS_KEY_INFO);
-        this.buffalo.writeSecManContext(context);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_APS_KEY_INFO);
+        sendBuffalo.writeSecManContext(context);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             context.eui64 = this.buffalo.readIeeeAddr();
             const keyData = this.buffalo.readSecManAPSKeyMetadata();
             const status = this.buffalo.readUInt32();
@@ -5159,11 +5166,11 @@ class Ezsp extends events_1.default {
          * @return SLStatus.OK upon success, a valid error code otherwise.
          *
          */
-        this.startCommand(enums_2.EzspFrameID.IMPORT_LINK_KEY);
-        this.buffalo.writeUInt8(index);
-        this.buffalo.writeIeeeAddr(address);
-        this.buffalo.writeSecManKey(plaintextKey);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.IMPORT_LINK_KEY);
+        sendBuffalo.writeUInt8(index);
+        sendBuffalo.writeIeeeAddr(address);
+        sendBuffalo.writeSecManKey(plaintextKey);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5187,13 +5194,13 @@ class Ezsp extends events_1.default {
          * @param plaintext_key sl_zb_sec_man_key_t*
          * @param key_data sl_zb_sec_man_aps_key_metadata_t*
          */
-        this.startCommand(enums_2.EzspFrameID.EXPORT_LINK_KEY_BY_INDEX);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.EXPORT_LINK_KEY_BY_INDEX);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             const context = (0, initters_1.initSecurityManagerContext)();
             context.coreKeyType = enums_1.SecManKeyType.APP_LINK;
             context.keyIndex = index;
@@ -5230,13 +5237,13 @@ class Ezsp extends events_1.default {
          * @param plaintext_key sl_zb_sec_man_key_t*
          * @param key_data sl_zb_sec_man_aps_key_metadata_t*
          */
-        this.startCommand(enums_2.EzspFrameID.EXPORT_LINK_KEY_BY_EUI);
-        this.buffalo.writeIeeeAddr(eui);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.EXPORT_LINK_KEY_BY_EUI);
+        sendBuffalo.writeIeeeAddr(eui);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             const plaintextKey = this.buffalo.readSecManKey();
             const context = (0, initters_1.initSecurityManagerContext)();
             context.coreKeyType = enums_1.SecManKeyType.APP_LINK;
@@ -5269,9 +5276,9 @@ class Ezsp extends events_1.default {
          *
          * @return SLStatus SLStatus.OK upon success, SLStatus.NOT_FOUND otherwise.
          */
-        this.startCommand(enums_2.EzspFrameID.CHECK_KEY_CONTEXT);
-        this.buffalo.writeSecManContext(context);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CHECK_KEY_CONTEXT);
+        sendBuffalo.writeSecManContext(context);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5295,13 +5302,13 @@ class Ezsp extends events_1.default {
          * ::EMBER_AF_PLUGIN_NETWORK_CREATOR_SECURITY_NETWORK_OPEN_TIME_S seconds and
          * ::EMBER_TRANSIENT_KEY_TIMEOUT_S seconds.
          */
-        this.startCommand(enums_2.EzspFrameID.IMPORT_TRANSIENT_KEY);
-        this.buffalo.writeIeeeAddr(eui64);
-        this.buffalo.writeSecManKey(plaintextKey);
-        if (this.version < 0x0E) {
-            this.buffalo.writeUInt8(flags);
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.IMPORT_TRANSIENT_KEY);
+        sendBuffalo.writeIeeeAddr(eui64);
+        sendBuffalo.writeSecManKey(plaintextKey);
+        if (this.version < 0x0e) {
+            sendBuffalo.writeUInt8(flags);
         }
-        const sendStatus = await this.sendCommand();
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5317,13 +5324,13 @@ class Ezsp extends events_1.default {
      * @returns sl_zb_sec_man_aps_key_metadata_t * Metadata about the key.
      */
     async ezspExportTransientKeyByIndex(index) {
-        this.startCommand(enums_2.EzspFrameID.EXPORT_TRANSIENT_KEY_BY_INDEX);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.EXPORT_TRANSIENT_KEY_BY_INDEX);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             const context = this.buffalo.readSecManContext();
             const plaintextKey = this.buffalo.readSecManKey();
             const keyData = this.buffalo.readSecManAPSKeyMetadata();
@@ -5347,13 +5354,13 @@ class Ezsp extends events_1.default {
      * @returns sl_zb_sec_man_aps_key_metadata_t * Metadata about the key.
      */
     async ezspExportTransientKeyByEui(eui) {
-        this.startCommand(enums_2.EzspFrameID.EXPORT_TRANSIENT_KEY_BY_EUI);
-        this.buffalo.writeIeeeAddr(eui);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.EXPORT_TRANSIENT_KEY_BY_EUI);
+        sendBuffalo.writeIeeeAddr(eui);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             const context = this.buffalo.readSecManContext();
             const plaintextKey = this.buffalo.readSecManKey();
             const keyData = this.buffalo.readSecManAPSKeyMetadata();
@@ -5373,12 +5380,12 @@ class Ezsp extends events_1.default {
      * @param frameCounter Value to set the frame counter to.
      */
     async ezspSetIncomingTcLinkKeyFrameCounter(frameCounter) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.SET_INCOMING_TC_LINK_KEY_FRAME_COUNTER);
-        this.buffalo.writeUInt32(frameCounter);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_INCOMING_TC_LINK_KEY_FRAME_COUNTER);
+        sendBuffalo.writeUInt32(frameCounter);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5393,16 +5400,16 @@ class Ezsp extends events_1.default {
      * @returns Status of the encryption/decryption call.
      */
     async ezspApsCryptMessage(encrypt, lengthCombinedArg, message, apsHeaderEndIndex, remoteEui64) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.APS_CRYPT_MESSAGE);
-        this.buffalo.writeUInt8(encrypt ? 1 : 0);
-        this.buffalo.writeUInt8(lengthCombinedArg);
-        this.buffalo.writeBuffer(message, lengthCombinedArg);
-        this.buffalo.writeUInt8(apsHeaderEndIndex);
-        this.buffalo.writeIeeeAddr(remoteEui64);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.APS_CRYPT_MESSAGE);
+        sendBuffalo.writeUInt8(encrypt ? 1 : 0);
+        sendBuffalo.writeUInt8(lengthCombinedArg);
+        sendBuffalo.writeBuffer(message, lengthCombinedArg);
+        sendBuffalo.writeUInt8(apsHeaderEndIndex);
+        sendBuffalo.writeIeeeAddr(remoteEui64);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5426,9 +5433,9 @@ class Ezsp extends events_1.default {
      * @param parentOfNewNodeId The parent of the node whose status has changed.
      */
     ezspTrustCenterJoinHandler(newNodeId, newNodeEui64, status, policyDecision, parentOfNewNodeId) {
-        logger_1.logger.debug(`ezspTrustCenterJoinHandler(): callback called with: [newNodeId=${newNodeId}], [newNodeEui64=${newNodeEui64}], `
-            + `[status=${enums_1.EmberDeviceUpdate[status]}], [policyDecision=${enums_1.EmberJoinDecision[policyDecision]}], `
-            + `[parentOfNewNodeId=${parentOfNewNodeId}]`, NS);
+        logger_1.logger.debug(`ezspTrustCenterJoinHandler(): callback called with: [newNodeId=${newNodeId}], [newNodeEui64=${newNodeEui64}], ` +
+            `[status=${enums_1.EmberDeviceUpdate[status]}], [policyDecision=${enums_1.EmberJoinDecision[policyDecision]}], ` +
+            `[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);
     }
@@ -5443,9 +5450,9 @@ class Ezsp extends events_1.default {
      * @returns SLStatus value that indicates the success or failure of the command.
      */
     async ezspBroadcastNextNetworkKey(key) {
-        this.startCommand(enums_2.EzspFrameID.BROADCAST_NEXT_NETWORK_KEY);
-        this.buffalo.writeEmberKeyData(key);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.BROADCAST_NEXT_NETWORK_KEY);
+        sendBuffalo.writeEmberKeyData(key);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5458,8 +5465,8 @@ class Ezsp extends events_1.default {
      * @returns SLStatus value that indicates the success or failure of the command.
      */
     async ezspBroadcastNetworkKeySwitch() {
-        this.startCommand(enums_2.EzspFrameID.BROADCAST_NETWORK_KEY_SWITCH);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.BROADCAST_NETWORK_KEY_SWITCH);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5479,11 +5486,11 @@ class Ezsp extends events_1.default {
      * @returns EmberAesMmoHashContext * The updated hash context.
      */
     async ezspAesMmoHash(context, finalize, data) {
-        this.startCommand(enums_2.EzspFrameID.AES_MMO_HASH);
-        this.buffalo.writeEmberAesMmoHashContext(context);
-        this.buffalo.writeUInt8(finalize ? 1 : 0);
-        this.buffalo.writePayload(data);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.AES_MMO_HASH);
+        sendBuffalo.writeEmberAesMmoHashContext(context);
+        sendBuffalo.writeUInt8(finalize ? 1 : 0);
+        sendBuffalo.writePayload(data);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5501,11 +5508,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success, or the reason for failure
      */
     async ezspRemoveDevice(destShort, destLong, targetLong) {
-        this.startCommand(enums_2.EzspFrameID.REMOVE_DEVICE);
-        this.buffalo.writeUInt16(destShort);
-        this.buffalo.writeIeeeAddr(destLong);
-        this.buffalo.writeIeeeAddr(targetLong);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.REMOVE_DEVICE);
+        sendBuffalo.writeUInt16(destShort);
+        sendBuffalo.writeIeeeAddr(destLong);
+        sendBuffalo.writeIeeeAddr(targetLong);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5522,11 +5529,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success, or the reason for failure
      */
     async ezspUnicastNwkKeyUpdate(destShort, destLong, key) {
-        this.startCommand(enums_2.EzspFrameID.UNICAST_NWK_KEY_UPDATE);
-        this.buffalo.writeUInt16(destShort);
-        this.buffalo.writeIeeeAddr(destLong);
-        this.buffalo.writeEmberKeyData(key);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.UNICAST_NWK_KEY_UPDATE);
+        sendBuffalo.writeUInt16(destShort);
+        sendBuffalo.writeIeeeAddr(destLong);
+        sendBuffalo.writeEmberKeyData(key);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5542,8 +5549,8 @@ class Ezsp extends events_1.default {
      * ezspGenerateCbkeKeysHandler().
      */
     async ezspGenerateCbkeKeys() {
-        this.startCommand(enums_2.EzspFrameID.GENERATE_CBKE_KEYS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GENERATE_CBKE_KEYS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5573,11 +5580,11 @@ class Ezsp extends events_1.default {
      * @param partnerEphemeralPublicKey EmberPublicKeyData * The key establishment partner's ephemeral public key
      */
     async ezspCalculateSmacs(amInitiator, partnerCertificate, partnerEphemeralPublicKey) {
-        this.startCommand(enums_2.EzspFrameID.CALCULATE_SMACS);
-        this.buffalo.writeUInt8(amInitiator ? 1 : 0);
-        this.buffalo.writeEmberCertificateData(partnerCertificate);
-        this.buffalo.writeEmberPublicKeyData(partnerEphemeralPublicKey);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CALCULATE_SMACS);
+        sendBuffalo.writeUInt8(amInitiator ? 1 : 0);
+        sendBuffalo.writeEmberCertificateData(partnerCertificate);
+        sendBuffalo.writeEmberPublicKeyData(partnerEphemeralPublicKey);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5595,8 +5602,8 @@ class Ezsp extends events_1.default {
      * @param responderSmac EmberSmacData * The calculated value of the responder's SMAC
      */
     ezspCalculateSmacsHandler(status, initiatorSmac, responderSmac) {
-        logger_1.logger.debug(`ezspCalculateSmacsHandler(): callback called with: [status=${enums_1.SLStatus[status]}], [initiatorSmac=${initiatorSmac}], `
-            + `[responderSmac=${responderSmac}]`, NS);
+        logger_1.logger.debug(`ezspCalculateSmacsHandler(): callback called with: [status=${enums_1.SLStatus[status]}], [initiatorSmac=${initiatorSmac}], ` +
+            `[responderSmac=${responderSmac}]`, NS);
     }
     /**
      * This call starts the generation of the ECC 283k1 curve Ephemeral
@@ -5604,8 +5611,8 @@ class Ezsp extends events_1.default {
      * are returned via ezspGenerateCbkeKeysHandler283k1().
      */
     async ezspGenerateCbkeKeys283k1() {
-        this.startCommand(enums_2.EzspFrameID.GENERATE_CBKE_KEYS283K1);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GENERATE_CBKE_KEYS283K1);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5622,8 +5629,7 @@ class Ezsp extends events_1.default {
      * @param ephemeralPublicKey EmberPublicKey283k1Data * The generated ephemeral public key.
      */
     ezspGenerateCbkeKeysHandler283k1(status, ephemeralPublicKey) {
-        logger_1.logger.debug(`ezspGenerateCbkeKeysHandler283k1(): callback called with: [status=${enums_1.SLStatus[status]}], `
-            + `[ephemeralPublicKey=${ephemeralPublicKey}]`, NS);
+        logger_1.logger.debug(`ezspGenerateCbkeKeysHandler283k1(): callback called with: [status=${enums_1.SLStatus[status]}], ` + `[ephemeralPublicKey=${ephemeralPublicKey}]`, NS);
     }
     /**
      * Calculates the SMAC verification keys for both the initiator and responder
@@ -5636,11 +5642,11 @@ class Ezsp extends events_1.default {
      * @param partnerEphemeralPublicKey EmberPublicKey283k1Data * The key establishment partner's ephemeral public key
      */
     async ezspCalculateSmacs283k1(amInitiator, partnerCertificate, partnerEphemeralPublicKey) {
-        this.startCommand(enums_2.EzspFrameID.CALCULATE_SMACS283K1);
-        this.buffalo.writeUInt8(amInitiator ? 1 : 0);
-        this.buffalo.writeEmberCertificate283k1Data(partnerCertificate);
-        this.buffalo.writeEmberPublicKey283k1Data(partnerEphemeralPublicKey);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CALCULATE_SMACS283K1);
+        sendBuffalo.writeUInt8(amInitiator ? 1 : 0);
+        sendBuffalo.writeEmberCertificate283k1Data(partnerCertificate);
+        sendBuffalo.writeEmberPublicKey283k1Data(partnerEphemeralPublicKey);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5659,8 +5665,8 @@ class Ezsp extends events_1.default {
      * @param responderSmac EmberSmacData * The calculated value of the responder's SMAC
      */
     ezspCalculateSmacsHandler283k1(status, initiatorSmac, responderSmac) {
-        logger_1.logger.debug(`ezspCalculateSmacsHandler283k1(): callback called with: [status=${enums_1.SLStatus[status]}], [initiatorSmac=${initiatorSmac}], `
-            + `[responderSmac=${responderSmac}]`, NS);
+        logger_1.logger.debug(`ezspCalculateSmacsHandler283k1(): callback called with: [status=${enums_1.SLStatus[status]}], [initiatorSmac=${initiatorSmac}], ` +
+            `[responderSmac=${responderSmac}]`, NS);
     }
     /**
      * Clears the temporary data associated with CBKE and the key establishment,
@@ -5671,9 +5677,9 @@ class Ezsp extends events_1.default {
      *        key derived when ezspCalculateSmacs() was previously called.
      */
     async ezspClearTemporaryDataMaybeStoreLinkKey(storeLinkKey) {
-        this.startCommand(enums_2.EzspFrameID.CLEAR_TEMPORARY_DATA_MAYBE_STORE_LINK_KEY);
-        this.buffalo.writeUInt8(storeLinkKey ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CLEAR_TEMPORARY_DATA_MAYBE_STORE_LINK_KEY);
+        sendBuffalo.writeUInt8(storeLinkKey ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5689,9 +5695,9 @@ class Ezsp extends events_1.default {
      *        key derived when ezspCalculateSmacs() was previously called.
      */
     async ezspClearTemporaryDataMaybeStoreLinkKey283k1(storeLinkKey) {
-        this.startCommand(enums_2.EzspFrameID.CLEAR_TEMPORARY_DATA_MAYBE_STORE_LINK_KEY283K1);
-        this.buffalo.writeUInt8(storeLinkKey ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.CLEAR_TEMPORARY_DATA_MAYBE_STORE_LINK_KEY283K1);
+        sendBuffalo.writeUInt8(storeLinkKey ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5703,8 +5709,8 @@ class Ezsp extends events_1.default {
      * @returns EmberCertificateData * The locally installed certificate.
      */
     async ezspGetCertificate() {
-        this.startCommand(enums_2.EzspFrameID.GET_CERTIFICATE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_CERTIFICATE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5717,8 +5723,8 @@ class Ezsp extends events_1.default {
      * @returns EmberCertificate283k1Data * The locally installed certificate.
      */
     async ezspGetCertificate283k1() {
-        this.startCommand(enums_2.EzspFrameID.GET_CERTIFICATE283K1);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_CERTIFICATE283K1);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5750,11 +5756,11 @@ class Ezsp extends events_1.default {
      * @param receivedSig EmberSignatureData * The signature of the signed data.
      */
     async ezspDsaVerify(digest, signerCertificate, receivedSig) {
-        this.startCommand(enums_2.EzspFrameID.DSA_VERIFY);
-        this.buffalo.writeEmberMessageDigest(digest);
-        this.buffalo.writeEmberCertificateData(signerCertificate);
-        this.buffalo.writeEmberSignatureData(receivedSig);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.DSA_VERIFY);
+        sendBuffalo.writeEmberMessageDigest(digest);
+        sendBuffalo.writeEmberCertificateData(signerCertificate);
+        sendBuffalo.writeEmberSignatureData(receivedSig);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5784,11 +5790,11 @@ class Ezsp extends events_1.default {
      * @param receivedSig EmberSignature283k1Data * The signature of the signed data.
      */
     async ezspDsaVerify283k1(digest, signerCertificate, receivedSig) {
-        this.startCommand(enums_2.EzspFrameID.DSA_VERIFY283K1);
-        this.buffalo.writeEmberMessageDigest(digest);
-        this.buffalo.writeEmberCertificate283k1Data(signerCertificate);
-        this.buffalo.writeEmberSignature283k1Data(receivedSig);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.DSA_VERIFY283K1);
+        sendBuffalo.writeEmberMessageDigest(digest);
+        sendBuffalo.writeEmberCertificate283k1Data(signerCertificate);
+        sendBuffalo.writeEmberSignature283k1Data(receivedSig);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5803,11 +5809,11 @@ class Ezsp extends events_1.default {
      * @param myKey EmberPrivateKeyData *The node's new static private key.
      */
     async ezspSetPreinstalledCbkeData(caPublic, myCert, myKey) {
-        this.startCommand(enums_2.EzspFrameID.SET_PREINSTALLED_CBKE_DATA);
-        this.buffalo.writeEmberPublicKeyData(caPublic);
-        this.buffalo.writeEmberCertificateData(myCert);
-        this.buffalo.writeEmberPrivateKeyData(myKey);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_PREINSTALLED_CBKE_DATA);
+        sendBuffalo.writeEmberPublicKeyData(caPublic);
+        sendBuffalo.writeEmberCertificateData(myCert);
+        sendBuffalo.writeEmberPrivateKeyData(myKey);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5820,8 +5826,8 @@ class Ezsp extends events_1.default {
      * @returns Status of operation
      */
     async ezspSavePreinstalledCbkeData283k1() {
-        this.startCommand(enums_2.EzspFrameID.SAVE_PREINSTALLED_CBKE_DATA283K1);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SAVE_PREINSTALLED_CBKE_DATA283K1);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5840,9 +5846,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalStart(rxCallback) {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_START);
-        this.buffalo.writeUInt8(rxCallback ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_START);
+        sendBuffalo.writeUInt8(rxCallback ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5856,8 +5862,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalEnd() {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_END);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_END);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5873,8 +5879,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalStartTone() {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_START_TONE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_START_TONE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5886,8 +5892,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalStopTone() {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_STOP_TONE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_STOP_TONE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5900,8 +5906,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalStartStream() {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_START_STREAM);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_START_STREAM);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5914,8 +5920,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalStopStream() {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_STOP_STREAM);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_STOP_STREAM);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5932,9 +5938,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalSendPacket(packetContents) {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_SEND_PACKET);
-        this.buffalo.writePayload(packetContents);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_SEND_PACKET);
+        sendBuffalo.writePayload(packetContents);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5948,9 +5954,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalSetChannel(channel) {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_SET_CHANNEL);
-        this.buffalo.writeUInt8(channel);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_SET_CHANNEL);
+        sendBuffalo.writeUInt8(channel);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5962,8 +5968,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The current channel.
      */
     async mfglibInternalGetChannel() {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_GET_CHANNEL);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_GET_CHANNEL);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5981,10 +5987,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async mfglibInternalSetPower(txPowerMode, power) {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_SET_POWER);
-        this.buffalo.writeUInt16(txPowerMode);
-        this.buffalo.writeInt8(power);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_SET_POWER);
+        sendBuffalo.writeUInt16(txPowerMode);
+        sendBuffalo.writeInt8(power);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -5996,8 +6002,8 @@ class Ezsp extends events_1.default {
      * @returns int8_t Power in units of dBm. Refer to radio data sheet for valid range.
      */
     async mfglibInternalGetPower() {
-        this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_GET_POWER);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFGLIB_INTERNAL_GET_POWER);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6009,12 +6015,12 @@ class Ezsp extends events_1.default {
      * A callback indicating a packet with a valid CRC has been received.
      * @param linkQuality uint8_t The link quality observed during the reception
      * @param rssi int8_t The energy level (in units of dBm) observed during the reception.
-     * @param packetLength uint8_t The length of the packetContents parameter in bytes. Will be greater than 3 and less than 123.
      * @param packetContents uint8_t * The received packet (last 2 bytes are not FCS / CRC and may be discarded)
+     *        Length will be greater than 3 and less than 123.
      */
-    ezspMfglibRxHandler(linkQuality, rssi, packetLength, packetContents) {
-        logger_1.logger.debug(`ezspMfglibRxHandler(): callback called with: [linkQuality=${linkQuality}], [rssi=${rssi}], `
-            + `[packetLength=${packetLength}], [packetContents=${packetContents}]`, NS);
+    ezspMfglibRxHandler(linkQuality, rssi, packetContents) {
+        logger_1.logger.debug(`ezspMfglibRxHandler(): callback called with: [linkQuality=${linkQuality}], [rssi=${rssi}], ` +
+            `[packetContents=${packetContents.toString('hex')}]`, NS);
     }
     //-----------------------------------------------------------------------------
     // Bootloader Frames
@@ -6031,9 +6037,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspLaunchStandaloneBootloader(mode) {
-        this.startCommand(enums_2.EzspFrameID.LAUNCH_STANDALONE_BOOTLOADER);
-        this.buffalo.writeUInt8(mode);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.LAUNCH_STANDALONE_BOOTLOADER);
+        sendBuffalo.writeUInt8(mode);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6051,11 +6057,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSendBootloadMessage(broadcast, destEui64, messageContents) {
-        this.startCommand(enums_2.EzspFrameID.SEND_BOOTLOAD_MESSAGE);
-        this.buffalo.writeUInt8(broadcast ? 1 : 0);
-        this.buffalo.writeIeeeAddr(destEui64);
-        this.buffalo.writePayload(messageContents);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SEND_BOOTLOAD_MESSAGE);
+        sendBuffalo.writeUInt8(broadcast ? 1 : 0);
+        sendBuffalo.writeIeeeAddr(destEui64);
+        sendBuffalo.writePayload(messageContents);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6074,8 +6080,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * The value of PHY on the node
      */
     async ezspGetStandaloneBootloaderVersionPlatMicroPhy() {
-        this.startCommand(enums_2.EzspFrameID.GET_STANDALONE_BOOTLOADER_VERSION_PLAT_MICRO_PHY);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_STANDALONE_BOOTLOADER_VERSION_PLAT_MICRO_PHY);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6094,8 +6100,8 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t *The bootload message that was sent.
      */
     ezspIncomingBootloadMessageHandler(longId, packetInfo, messageContents) {
-        logger_1.logger.debug(`ezspIncomingBootloadMessageHandler(): callback called with: [longId=${longId}], [packetInfo=${JSON.stringify(packetInfo)}], `
-            + `[messageContents=${messageContents.toString('hex')}]`, NS);
+        logger_1.logger.debug(`ezspIncomingBootloadMessageHandler(): callback called with: [longId=${longId}], [packetInfo=${JSON.stringify(packetInfo)}], ` +
+            `[messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * Callback
@@ -6107,8 +6113,8 @@ class Ezsp extends events_1.default {
      * @param messageContents uint8_t * The message that was sent.
      */
     ezspBootloadTransmitCompleteHandler(status, messageContents) {
-        logger_1.logger.debug(`ezspBootloadTransmitCompleteHandler(): callback called with: [status=${enums_1.SLStatus[status]}], `
-            + `[messageContents=${messageContents.toString('hex')}]`, NS);
+        logger_1.logger.debug(`ezspBootloadTransmitCompleteHandler(): callback called with: [status=${enums_1.SLStatus[status]}], ` +
+            `[messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * Perform AES encryption on plaintext using key.
@@ -6117,14 +6123,14 @@ class Ezsp extends events_1.default {
      * @returns uint8_t * 16 bytes of ciphertext.
      */
     async ezspAesEncrypt(plaintext, key) {
-        this.startCommand(enums_2.EzspFrameID.AES_ENCRYPT);
-        this.buffalo.writeListUInt8(plaintext);
-        this.buffalo.writeListUInt8(key);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.AES_ENCRYPT);
+        sendBuffalo.writeListUInt8(plaintext);
+        sendBuffalo.writeListUInt8(key);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
-        const ciphertext = this.buffalo.readListUInt8(consts_1.EMBER_ENCRYPTION_KEY_SIZE);
+        const ciphertext = this.buffalo.readListUInt8(consts_2.EMBER_ENCRYPTION_KEY_SIZE);
         return ciphertext;
     }
     /**
@@ -6136,8 +6142,8 @@ class Ezsp extends events_1.default {
      * @param data uint8_t * A pointer to the data received in the current message.
      */
     ezspIncomingMfgTestMessageHandler(messageType, messageContents) {
-        logger_1.logger.debug(`ezspIncomingMfgTestMessageHandler(): callback called with: [messageType=${messageType}], `
-            + `[messageContents=${messageContents.toString('hex')}]`, NS);
+        logger_1.logger.debug(`ezspIncomingMfgTestMessageHandler(): callback called with: [messageType=${messageType}], ` +
+            `[messageContents=${messageContents.toString('hex')}]`, NS);
     }
     /**
      * A function used on the Golden Node to switch between normal network operation (for testing) and manufacturing configuration.
@@ -6150,12 +6156,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or failure of the command.
      */
     async ezspMfgTestSetPacketMode(beginConfiguration) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MFG_TEST_SET_PACKET_MODE);
-        this.buffalo.writeUInt8(beginConfiguration ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFG_TEST_SET_PACKET_MODE);
+        sendBuffalo.writeUInt8(beginConfiguration ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6171,11 +6177,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or failure of the command.
      */
     async ezspMfgTestSendRebootCommand() {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_REBOOT_COMMAND);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_REBOOT_COMMAND);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6190,12 +6196,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or failure of the command.
      */
     async ezspMfgTestSendEui64(newId) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_EUI64);
-        this.buffalo.writeIeeeAddr(newId);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_EUI64);
+        sendBuffalo.writeIeeeAddr(newId);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6210,12 +6216,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or failure of the command.
      */
     async ezspMfgTestSendManufacturingString(newString) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_MANUFACTURING_STRING);
-        this.buffalo.writeListUInt16(newString); // expects 16 bytes
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_MANUFACTURING_STRING);
+        sendBuffalo.writeListUInt16(newString); // expects 16 bytes
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6231,13 +6237,13 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or failure of the command.
      */
     async ezspMfgTestSendRadioParameters(supportedBands, crystalOffset) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_RADIO_PARAMETERS);
-        this.buffalo.writeUInt8(supportedBands);
-        this.buffalo.writeInt8(crystalOffset);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_RADIO_PARAMETERS);
+        sendBuffalo.writeUInt8(supportedBands);
+        sendBuffalo.writeInt8(crystalOffset);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6252,12 +6258,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or failure of the command.
      */
     async ezspMfgTestSendCommand(command) {
-        if (this.version < 0x0E) {
+        if (this.version < 0x0e) {
             throw new ezspError_1.EzspError(enums_1.EzspStatus.ERROR_INVALID_FRAME_ID);
         }
-        this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_COMMAND);
-        this.buffalo.writeUInt8(command);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.MFG_TEST_SEND_COMMAND);
+        sendBuffalo.writeUInt8(command);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6276,11 +6282,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspZllNetworkOps(networkInfo, op, radioTxPower) {
-        this.startCommand(enums_2.EzspFrameID.ZLL_NETWORK_OPS);
-        this.buffalo.writeEmberZllNetwork(networkInfo);
-        this.buffalo.writeUInt8(op);
-        this.buffalo.writeInt8(radioTxPower);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_NETWORK_OPS);
+        sendBuffalo.writeEmberZllNetwork(networkInfo);
+        sendBuffalo.writeUInt8(op);
+        sendBuffalo.writeInt8(radioTxPower);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6295,10 +6301,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspZllSetInitialSecurityState(networkKey, securityState) {
-        this.startCommand(enums_2.EzspFrameID.ZLL_SET_INITIAL_SECURITY_STATE);
-        this.buffalo.writeEmberKeyData(networkKey);
-        this.buffalo.writeEmberZllInitialSecurityState(securityState);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_SET_INITIAL_SECURITY_STATE);
+        sendBuffalo.writeEmberKeyData(networkKey);
+        sendBuffalo.writeEmberZllInitialSecurityState(securityState);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6313,9 +6319,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspZllSetSecurityStateWithoutKey(securityState) {
-        this.startCommand(enums_2.EzspFrameID.ZLL_SET_SECURITY_STATE_WITHOUT_KEY);
-        this.buffalo.writeEmberZllInitialSecurityState(securityState);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_SET_SECURITY_STATE_WITHOUT_KEY);
+        sendBuffalo.writeEmberZllInitialSecurityState(securityState);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6330,11 +6336,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspZllStartScan(channelMask, radioPowerForScan, nodeType) {
-        this.startCommand(enums_2.EzspFrameID.ZLL_START_SCAN);
-        this.buffalo.writeUInt32(channelMask);
-        this.buffalo.writeInt8(radioPowerForScan);
-        this.buffalo.writeUInt8(nodeType);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_START_SCAN);
+        sendBuffalo.writeUInt32(channelMask);
+        sendBuffalo.writeInt8(radioPowerForScan);
+        sendBuffalo.writeUInt8(nodeType);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6348,9 +6354,9 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspZllSetRxOnWhenIdle(durationMs) {
-        this.startCommand(enums_2.EzspFrameID.ZLL_SET_RX_ON_WHEN_IDLE);
-        this.buffalo.writeUInt32(durationMs);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_SET_RX_ON_WHEN_IDLE);
+        sendBuffalo.writeUInt32(durationMs);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6366,8 +6372,8 @@ class Ezsp extends events_1.default {
      * @param packetInfo Information about the incoming packet received from this network.
      */
     ezspZllNetworkFoundHandler(networkInfo, isDeviceInfoNull, deviceInfo, packetInfo) {
-        logger_1.logger.debug(`ezspZllNetworkFoundHandler(): callback called with: [networkInfo=${networkInfo}], [isDeviceInfoNull=${isDeviceInfoNull}], `
-            + `[deviceInfo=${deviceInfo}], [packetInfo=${JSON.stringify(packetInfo)}]`, NS);
+        logger_1.logger.debug(`ezspZllNetworkFoundHandler(): callback called with: [networkInfo=${networkInfo}], [isDeviceInfoNull=${isDeviceInfoNull}], ` +
+            `[deviceInfo=${deviceInfo}], [packetInfo=${JSON.stringify(packetInfo)}]`, NS);
     }
     /**
      * Callback
@@ -6385,8 +6391,7 @@ class Ezsp extends events_1.default {
      * @param packetInfo Information about the incoming packet received from this network.
      */
     ezspZllAddressAssignmentHandler(addressInfo, packetInfo) {
-        logger_1.logger.debug(`ezspZllAddressAssignmentHandler(): callback called with: [addressInfo=${addressInfo}], `
-            + `[packetInfo=${JSON.stringify(packetInfo)}]`, NS);
+        logger_1.logger.debug(`ezspZllAddressAssignmentHandler(): callback called with: [addressInfo=${addressInfo}], ` + `[packetInfo=${JSON.stringify(packetInfo)}]`, NS);
     }
     /**
      * Callback
@@ -6402,8 +6407,8 @@ class Ezsp extends events_1.default {
      * @returns EmberTokTypeStackZllSecurity * Security token return value.
      */
     async ezspZllGetTokens() {
-        this.startCommand(enums_2.EzspFrameID.ZLL_GET_TOKENS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_GET_TOKENS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6416,9 +6421,9 @@ class Ezsp extends events_1.default {
      * @param data EmberTokTypeStackZllData * Data token to be set.
      */
     async ezspZllSetDataToken(data) {
-        this.startCommand(enums_2.EzspFrameID.ZLL_SET_DATA_TOKEN);
-        this.buffalo.writeEmberTokTypeStackZllData(data);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_SET_DATA_TOKEN);
+        sendBuffalo.writeEmberTokTypeStackZllData(data);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6427,8 +6432,8 @@ class Ezsp extends events_1.default {
      * Set the ZLL data token bitmask to reflect the ZLL network state.
      */
     async ezspZllSetNonZllNetwork() {
-        this.startCommand(enums_2.EzspFrameID.ZLL_SET_NON_ZLL_NETWORK);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_SET_NON_ZLL_NETWORK);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6438,8 +6443,8 @@ class Ezsp extends events_1.default {
      * @returns ZLL network?
      */
     async ezspIsZllNetwork() {
-        this.startCommand(enums_2.EzspFrameID.IS_ZLL_NETWORK);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.IS_ZLL_NETWORK);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6451,9 +6456,9 @@ class Ezsp extends events_1.default {
      * @param mode The power mode to be set.
      */
     async ezspZllSetRadioIdleMode(mode) {
-        this.startCommand(enums_2.EzspFrameID.ZLL_SET_RADIO_IDLE_MODE);
-        this.buffalo.writeUInt8(mode);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_SET_RADIO_IDLE_MODE);
+        sendBuffalo.writeUInt8(mode);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6463,8 +6468,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The current power mode.
      */
     async ezspZllGetRadioIdleMode() {
-        this.startCommand(enums_2.EzspFrameID.ZLL_GET_RADIO_IDLE_MODE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_GET_RADIO_IDLE_MODE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6476,9 +6481,9 @@ class Ezsp extends events_1.default {
      * @param nodeType The node type to be set.
      */
     async ezspSetZllNodeType(nodeType) {
-        this.startCommand(enums_2.EzspFrameID.SET_ZLL_NODE_TYPE);
-        this.buffalo.writeUInt8(nodeType);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_ZLL_NODE_TYPE);
+        sendBuffalo.writeUInt8(nodeType);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6488,9 +6493,9 @@ class Ezsp extends events_1.default {
      * @param uint16_t A mask with the bits to be set or cleared.
      */
     async ezspSetZllAdditionalState(state) {
-        this.startCommand(enums_2.EzspFrameID.SET_ZLL_ADDITIONAL_STATE);
-        this.buffalo.writeUInt16(state);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_ZLL_ADDITIONAL_STATE);
+        sendBuffalo.writeUInt16(state);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6500,8 +6505,8 @@ class Ezsp extends events_1.default {
      * @returns ZLL operation in progress? false on error
      */
     async ezspZllOperationInProgress() {
-        this.startCommand(enums_2.EzspFrameID.ZLL_OPERATION_IN_PROGRESS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_OPERATION_IN_PROGRESS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6513,8 +6518,8 @@ class Ezsp extends events_1.default {
      * @returns ZLL radio on when idle mode is active? false on error
      */
     async ezspZllRxOnWhenIdleGetActive() {
-        this.startCommand(enums_2.EzspFrameID.ZLL_RX_ON_WHEN_IDLE_GET_ACTIVE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_RX_ON_WHEN_IDLE_GET_ACTIVE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6525,8 +6530,8 @@ class Ezsp extends events_1.default {
      * Informs the ZLL API that application scanning is complete
      */
     async ezspZllScanningComplete() {
-        this.startCommand(enums_2.EzspFrameID.ZLL_SCANNING_COMPLETE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_SCANNING_COMPLETE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6536,8 +6541,8 @@ class Ezsp extends events_1.default {
      * @returns uint32_t The primary ZLL channel mask
      */
     async ezspGetZllPrimaryChannelMask() {
-        this.startCommand(enums_2.EzspFrameID.GET_ZLL_PRIMARY_CHANNEL_MASK);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ZLL_PRIMARY_CHANNEL_MASK);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6549,8 +6554,8 @@ class Ezsp extends events_1.default {
      * @returns uint32_t The secondary ZLL channel mask
      */
     async ezspGetZllSecondaryChannelMask() {
-        this.startCommand(enums_2.EzspFrameID.GET_ZLL_SECONDARY_CHANNEL_MASK);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_ZLL_SECONDARY_CHANNEL_MASK);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6562,9 +6567,9 @@ class Ezsp extends events_1.default {
      * @param uint32_t The primary ZLL channel mask
      */
     async ezspSetZllPrimaryChannelMask(zllPrimaryChannelMask) {
-        this.startCommand(enums_2.EzspFrameID.SET_ZLL_PRIMARY_CHANNEL_MASK);
-        this.buffalo.writeUInt32(zllPrimaryChannelMask);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_ZLL_PRIMARY_CHANNEL_MASK);
+        sendBuffalo.writeUInt32(zllPrimaryChannelMask);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6574,9 +6579,9 @@ class Ezsp extends events_1.default {
      * @param uint32_t The secondary ZLL channel mask
      */
     async ezspSetZllSecondaryChannelMask(zllSecondaryChannelMask) {
-        this.startCommand(enums_2.EzspFrameID.SET_ZLL_SECONDARY_CHANNEL_MASK);
-        this.buffalo.writeUInt32(zllSecondaryChannelMask);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_ZLL_SECONDARY_CHANNEL_MASK);
+        sendBuffalo.writeUInt32(zllSecondaryChannelMask);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6585,8 +6590,8 @@ class Ezsp extends events_1.default {
      * Clear ZLL stack tokens.
      */
     async ezspZllClearTokens() {
-        this.startCommand(enums_2.EzspFrameID.ZLL_CLEAR_TOKENS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.ZLL_CLEAR_TOKENS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6609,18 +6614,18 @@ class Ezsp extends events_1.default {
      * @returns Whether a GP Pairing has been created or not.
      */
     async ezspGpProxyTableProcessGpPairing(options, addr, commMode, sinkNetworkAddress, sinkGroupId, assignedAlias, sinkIeeeAddress, gpdKey, gpdSecurityFrameCounter, forwardingRadius) {
-        this.startCommand(enums_2.EzspFrameID.GP_PROXY_TABLE_PROCESS_GP_PAIRING);
-        this.buffalo.writeUInt32(options);
-        this.buffalo.writeEmberGpAddress(addr);
-        this.buffalo.writeUInt8(commMode);
-        this.buffalo.writeUInt16(sinkNetworkAddress);
-        this.buffalo.writeUInt16(sinkGroupId);
-        this.buffalo.writeUInt16(assignedAlias);
-        this.buffalo.writeIeeeAddr(sinkIeeeAddress);
-        this.buffalo.writeEmberKeyData(gpdKey);
-        this.buffalo.writeUInt32(gpdSecurityFrameCounter);
-        this.buffalo.writeUInt8(forwardingRadius);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_PROXY_TABLE_PROCESS_GP_PAIRING);
+        sendBuffalo.writeUInt32(options);
+        sendBuffalo.writeEmberGpAddress(addr);
+        sendBuffalo.writeUInt8(commMode);
+        sendBuffalo.writeUInt16(sinkNetworkAddress);
+        sendBuffalo.writeUInt16(sinkGroupId);
+        sendBuffalo.writeUInt16(assignedAlias);
+        sendBuffalo.writeIeeeAddr(sinkIeeeAddress);
+        sendBuffalo.writeEmberKeyData(gpdKey);
+        sendBuffalo.writeUInt32(gpdSecurityFrameCounter);
+        sendBuffalo.writeUInt8(forwardingRadius);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6639,15 +6644,15 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspDGpSend(action, useCca, addr, gpdCommandId, gpdAsdu, gpepHandle, gpTxQueueEntryLifetimeMs) {
-        this.startCommand(enums_2.EzspFrameID.D_GP_SEND);
-        this.buffalo.writeUInt8(action ? 1 : 0);
-        this.buffalo.writeUInt8(useCca ? 1 : 0);
-        this.buffalo.writeEmberGpAddress(addr);
-        this.buffalo.writeUInt8(gpdCommandId);
-        this.buffalo.writePayload(gpdAsdu);
-        this.buffalo.writeUInt8(gpepHandle);
-        this.buffalo.writeUInt16(gpTxQueueEntryLifetimeMs);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.D_GP_SEND);
+        sendBuffalo.writeUInt8(action ? 1 : 0);
+        sendBuffalo.writeUInt8(useCca ? 1 : 0);
+        sendBuffalo.writeEmberGpAddress(addr);
+        sendBuffalo.writeUInt8(gpdCommandId);
+        sendBuffalo.writePayload(gpdAsdu);
+        sendBuffalo.writeUInt8(gpepHandle);
+        sendBuffalo.writeUInt16(gpTxQueueEntryLifetimeMs);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6683,18 +6688,18 @@ 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) {
-        logger_1.logger.debug(`ezspGpepIncomingMessageHandler(): callback called with: [status=${enums_1.EmberGPStatus[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')}]`, NS);
+        logger_1.logger.debug(`ezspGpepIncomingMessageHandler(): callback called with: [status=${enums_1.EmberGPStatus[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')}]`, NS);
         if (addr.applicationId === enums_1.EmberGpApplicationId.IEEE_ADDRESS) {
             // XXX: don't bother parsing for upstream for now, since it will be rejected
             logger_1.logger.error(`<=== [GP] Received IEEE address type in message. Support not implemented upstream. Dropping.`, NS);
             return;
         }
         let commandIdentifier = cluster_1.Clusters.greenPower.commands.notification.ID;
-        if (gpdCommandId === 0xE0) {
+        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
@@ -6711,9 +6716,9 @@ class Ezsp extends events_1.default {
      * @returns EmberGpProxyTableEntry * An EmberGpProxyTableEntry struct containing a copy of the requested proxy entry.
      */
     async ezspGpProxyTableGetEntry(proxyIndex) {
-        this.startCommand(enums_2.EzspFrameID.GP_PROXY_TABLE_GET_ENTRY);
-        this.buffalo.writeUInt8(proxyIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_PROXY_TABLE_GET_ENTRY);
+        sendBuffalo.writeUInt8(proxyIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6727,9 +6732,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The index, or 0xFF for not found
      */
     async ezspGpProxyTableLookup(addr) {
-        this.startCommand(enums_2.EzspFrameID.GP_PROXY_TABLE_LOOKUP);
-        this.buffalo.writeEmberGpAddress(addr);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_PROXY_TABLE_LOOKUP);
+        sendBuffalo.writeEmberGpAddress(addr);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6743,9 +6748,9 @@ class Ezsp extends events_1.default {
      * @returns EmberGpSinkTableEntry * An EmberGpSinkTableEntry struct containing a copy of the requested sink entry.
      */
     async ezspGpSinkTableGetEntry(sinkIndex) {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_GET_ENTRY);
-        this.buffalo.writeUInt8(sinkIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_GET_ENTRY);
+        sendBuffalo.writeUInt8(sinkIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6759,9 +6764,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t The index, or 0xFF for not found
      */
     async ezspGpSinkTableLookup(addr) {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_LOOKUP);
-        this.buffalo.writeEmberGpAddress(addr);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_LOOKUP);
+        sendBuffalo.writeEmberGpAddress(addr);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6775,10 +6780,10 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspGpSinkTableSetEntry(sinkIndex, entry) {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_SET_ENTRY);
-        this.buffalo.writeUInt8(sinkIndex);
-        this.buffalo.writeEmberGpSinkTableEntry(entry);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_SET_ENTRY);
+        sendBuffalo.writeUInt8(sinkIndex);
+        sendBuffalo.writeEmberGpSinkTableEntry(entry);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6790,9 +6795,9 @@ class Ezsp extends events_1.default {
      * @param uint8_t The index of the requested sink table entry.
      */
     async ezspGpSinkTableRemoveEntry(sinkIndex) {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_REMOVE_ENTRY);
-        this.buffalo.writeUInt8(sinkIndex);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_REMOVE_ENTRY);
+        sendBuffalo.writeUInt8(sinkIndex);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6803,9 +6808,9 @@ class Ezsp extends events_1.default {
      * @returns uint8_t An index of found or allocated sink or 0xFF if failed.
      */
     async ezspGpSinkTableFindOrAllocateEntry(addr) {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_FIND_OR_ALLOCATE_ENTRY);
-        this.buffalo.writeEmberGpAddress(addr);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_FIND_OR_ALLOCATE_ENTRY);
+        sendBuffalo.writeEmberGpAddress(addr);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6816,8 +6821,8 @@ class Ezsp extends events_1.default {
      * Clear the entire sink table
      */
     async ezspGpSinkTableClearAll() {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_CLEAR_ALL);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_CLEAR_ALL);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6826,8 +6831,8 @@ class Ezsp extends events_1.default {
      * Iniitializes Sink Table
      */
     async ezspGpSinkTableInit() {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_INIT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_INIT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6838,10 +6843,10 @@ class Ezsp extends events_1.default {
      * @param sfc uint32_t Security Frame Counter
      */
     async ezspGpSinkTableSetSecurityFrameCounter(index, sfc) {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_SET_SECURITY_FRAME_COUNTER);
-        this.buffalo.writeUInt8(index);
-        this.buffalo.writeUInt32(sfc);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_SET_SECURITY_FRAME_COUNTER);
+        sendBuffalo.writeUInt8(index);
+        sendBuffalo.writeUInt32(sfc);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6855,12 +6860,12 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspGpSinkCommission(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_COMMISSION);
-        this.buffalo.writeUInt8(options);
-        this.buffalo.writeUInt16(gpmAddrForSecurity);
-        this.buffalo.writeUInt16(gpmAddrForPairing);
-        this.buffalo.writeUInt8(sinkEndpoint);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_COMMISSION);
+        sendBuffalo.writeUInt8(options);
+        sendBuffalo.writeUInt16(gpmAddrForSecurity);
+        sendBuffalo.writeUInt16(gpmAddrForPairing);
+        sendBuffalo.writeUInt8(sinkEndpoint);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6871,8 +6876,8 @@ class Ezsp extends events_1.default {
      * Clears all entries within the translation table.
      */
     async ezspGpTranslationTableClear() {
-        this.startCommand(enums_2.EzspFrameID.GP_TRANSLATION_TABLE_CLEAR);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_TRANSLATION_TABLE_CLEAR);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6882,8 +6887,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t Number of active entries in sink table. 0 if error.
      */
     async ezspGpSinkTableGetNumberOfActiveEntries() {
-        this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_GET_NUMBER_OF_ACTIVE_ENTRIES);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SINK_TABLE_GET_NUMBER_OF_ACTIVE_ENTRIES);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6898,8 +6903,8 @@ class Ezsp extends events_1.default {
      * @returns uint8_t Total number of tokens.
      */
     async ezspGetTokenCount() {
-        this.startCommand(enums_2.EzspFrameID.GET_TOKEN_COUNT);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_TOKEN_COUNT);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6913,9 +6918,9 @@ class Ezsp extends events_1.default {
      * @returns EmberTokenInfo * Token information.
      */
     async ezspGetTokenInfo(index) {
-        this.startCommand(enums_2.EzspFrameID.GET_TOKEN_INFO);
-        this.buffalo.writeUInt8(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_TOKEN_INFO);
+        sendBuffalo.writeUInt8(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6931,10 +6936,10 @@ class Ezsp extends events_1.default {
      * @returns EmberTokenData * Token Data
      */
     async ezspGetTokenData(token, index) {
-        this.startCommand(enums_2.EzspFrameID.GET_TOKEN_DATA);
-        this.buffalo.writeUInt32(token);
-        this.buffalo.writeUInt32(index);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GET_TOKEN_DATA);
+        sendBuffalo.writeUInt32(token);
+        sendBuffalo.writeUInt32(index);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6950,11 +6955,11 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspSetTokenData(token, index, tokenData) {
-        this.startCommand(enums_2.EzspFrameID.SET_TOKEN_DATA);
-        this.buffalo.writeUInt32(token);
-        this.buffalo.writeUInt32(index);
-        this.buffalo.writeEmberTokenData(tokenData);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.SET_TOKEN_DATA);
+        sendBuffalo.writeUInt32(token);
+        sendBuffalo.writeUInt32(index);
+        sendBuffalo.writeEmberTokenData(tokenData);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6965,8 +6970,8 @@ class Ezsp extends events_1.default {
      * Reset the node by calling halReboot.
      */
     async ezspResetNode() {
-        this.startCommand(enums_2.EzspFrameID.RESET_NODE);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.RESET_NODE);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6976,8 +6981,8 @@ class Ezsp extends events_1.default {
      * @returns An SLStatus value indicating success or the reason for failure.
      */
     async ezspGpSecurityTestVectors() {
-        this.startCommand(enums_2.EzspFrameID.GP_SECURITY_TEST_VECTORS);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.GP_SECURITY_TEST_VECTORS);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }
@@ -6990,10 +6995,10 @@ class Ezsp extends events_1.default {
      * @param excludeBootCounter Exclude stack boot counter token.
      */
     async ezspTokenFactoryReset(excludeOutgoingFC, excludeBootCounter) {
-        this.startCommand(enums_2.EzspFrameID.TOKEN_FACTORY_RESET);
-        this.buffalo.writeUInt8(excludeOutgoingFC ? 1 : 0);
-        this.buffalo.writeUInt8(excludeBootCounter ? 1 : 0);
-        const sendStatus = await this.sendCommand();
+        const sendBuffalo = this.startCommand(enums_2.EzspFrameID.TOKEN_FACTORY_RESET);
+        sendBuffalo.writeUInt8(excludeOutgoingFC ? 1 : 0);
+        sendBuffalo.writeUInt8(excludeBootCounter ? 1 : 0);
+        const sendStatus = await this.sendCommand(sendBuffalo);
         if (sendStatus !== enums_1.EzspStatus.SUCCESS) {
             throw new ezspError_1.EzspError(sendStatus);
         }