From 8efd6445f53ce190ce0d66423291ed7b43633ed0 Mon Sep 17 00:00:00 2001 From: Christian Hammacher Date: Fri, 14 Apr 2023 12:31:47 +0200 Subject: [PATCH] Fixed spurious G-code hangs in standalone mode --- src/store/machine/connector/PollConnector.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/store/machine/connector/PollConnector.ts b/src/store/machine/connector/PollConnector.ts index 97bbe533a..7eb165b5c 100644 --- a/src/store/machine/connector/PollConnector.ts +++ b/src/store/machine/connector/PollConnector.ts @@ -763,7 +763,7 @@ export default class PollConnector extends BaseConnector { } // Send the code to RRF - const response = await this.request("GET", "rr_gcode", { gcode: code }); + const seq = this.lastSeqs.reply, response = await this.request("GET", "rr_gcode", { gcode: code }); if (!(response instanceof Object)) { console.warn(`Received bad response for rr_gcode: ${JSON.stringify(response)}`); throw new CodeResponseError(); @@ -777,8 +777,8 @@ export default class PollConnector extends BaseConnector { } // Check if a response can be expected - if (!noWait && strippedCode !== "" && strippedCode.toUpperCase().indexOf("M997") === -1 && strippedCode.toUpperCase().indexOf("M999") === -1) { - const pendingCodes = this.pendingCodes, seq = this.lastSeqs.reply; + if (!noWait && seq === this.lastSeqs.reply && strippedCode !== "" && strippedCode.toUpperCase().indexOf("M997") === -1 && strippedCode.toUpperCase().indexOf("M999") === -1) { + const pendingCodes = this.pendingCodes; return new Promise((resolve, reject) => pendingCodes.push({ seq, resolve, reject })); } }