Skipping XOFF and XON byte in uart package. (#669)

Adding address pair to mapping on bind/unbind/remove request.
Koenkk · Feb 20, 2023 · c254ff3 · c254ff3
1 parent b587fb3
commit c254ff3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/adapter/ezsp/adapter/ezspAdapter.ts b/src/adapter/ezsp/adapter/ezspAdapter.ts
@@ -532,6 +532,9 @@ class EZSPAdapter extends Adapter {
             const addrmode = (type === 'group') ? 1 : 3;
             const ieeeDst = (type === 'group') ? destinationAddressOrGroup : 
                 new EmberEUI64(destinationAddressOrGroup as string);
+            if (type !== 'group') {
+                this.driver.setNode(destinationNetworkAddress, ieeeDst as EmberEUI64);
+            }
             await this.driver.zdoRequest(
                 destinationNetworkAddress, EmberZDOCmd.Bind_req, EmberZDOCmd.Bind_rsp,
                 {sourceEui: ieee, sourceEp: sourceEndpoint, clusterId: clusterID,
@@ -551,6 +554,9 @@ class EZSPAdapter extends Adapter {
             const addrmode = (type === 'group') ? 1 : 3;
             const ieeeDst = (type === 'group') ? destinationAddressOrGroup : 
                 new EmberEUI64(destinationAddressOrGroup as string);
+            if (type !== 'group') {
+                this.driver.setNode(destinationNetworkAddress, ieeeDst as EmberEUI64);
+            }
             await this.driver.zdoRequest(
                 destinationNetworkAddress, EmberZDOCmd.Unbind_req, EmberZDOCmd.Unbind_rsp,
                 {sourceEui: ieee, sourceEp: sourceEndpoint, clusterId: clusterID,
@@ -563,6 +569,7 @@ class EZSPAdapter extends Adapter {
         return this.driver.queue.execute<void>(async () => {
             this.checkInterpanLock();
             const ieee = new EmberEUI64(ieeeAddr);
+            this.driver.setNode(networkAddress, ieee);
             await this.driver.zdoRequest(
                 networkAddress, EmberZDOCmd.Mgmt_Leave_req, EmberZDOCmd.Mgmt_Leave_rsp,
                 {destAddr: ieee, removechildrenRejoin: 0x00}

diff --git a/src/adapter/ezsp/driver/parser.ts b/src/adapter/ezsp/driver/parser.ts
@@ -66,8 +66,10 @@ export class Parser extends stream.Transform {
                 out.writeUInt8(c ^ consts.STUFF, outIdx++);
                 escaped = false;
             } else {
-                if ((c === consts.ESCAPE)) {
+                if (c === consts.ESCAPE) {
                     escaped = true;
+                } else if (c === consts.XOFF || c === consts.XON) {
+                    // skip
                 } else {
                     out.writeUInt8(c, outIdx++);
                 }