From 2505b8e310f546982348bc777464f605312d8b54 Mon Sep 17 00:00:00 2001 From: ChK Date: Wed, 22 Apr 2026 12:17:48 +0200 Subject: [PATCH 1/3] Command handeling --- scripts/create-cert.sh | 0 server/fluidnc/FluidNCClient.js | 16 ++++++++++++++-- server/server.js | 2 +- web/index.html | 22 ++++++++++++++++------ 4 files changed, 31 insertions(+), 9 deletions(-) mode change 100644 => 100755 scripts/create-cert.sh diff --git a/scripts/create-cert.sh b/scripts/create-cert.sh old mode 100644 new mode 100755 diff --git a/server/fluidnc/FluidNCClient.js b/server/fluidnc/FluidNCClient.js index 8a84cc6..a7c564a 100644 --- a/server/fluidnc/FluidNCClient.js +++ b/server/fluidnc/FluidNCClient.js @@ -36,6 +36,14 @@ class FluidNCClient extends EventEmitter { this.ws.on("error", (err) => { console.log("[FluidNC] WS Error:", err.message); }); + + this.ws.on("unexpected-response", (req, res) => { + console.log("[FluidNC] WS Unexpected Response:", res.statusCode, res.statusMessage); + }); + + this.ws.on("disconnect", () => { + console.log("[FluidNC] WS Disconnected"); + }); } sendLine(cmd) { @@ -48,8 +56,12 @@ class FluidNCClient extends EventEmitter { this.sendLine("?"); } - jog(axis, value) { - const cmd = `$J=G91 ${axis}${value} F2000`; + jog(relative, axis, value) { + // $J= um den Befehl als Jog zu kennzeichnen + // G91 für relative Bewegungen (G90 für absolute) + // G1 Linearbewegung + const cmd = relative? `$J=G91 G1 ${axis}${value} F2000\r\n`: `$J=G90 G1 ${axis}${value} F2000\r\n`; + console.log("[FluidNC] Jog Command:", cmd); this.sendLine(cmd); } diff --git a/server/server.js b/server/server.js index fc9e2e9..eae5c7a 100644 --- a/server/server.js +++ b/server/server.js @@ -39,7 +39,7 @@ wss.on("connection", (ws) => { console.log("Message from WSS: " + msg); if (data.type === "jog") { - fluid.jog(data.axis, data.value); + fluid.jog(data.relative, data.axis, data.value); } if (data.type === "gcode") { diff --git a/web/index.html b/web/index.html index 29067bd..01c57e5 100644 --- a/web/index.html +++ b/web/index.html @@ -2,7 +2,7 @@ - 2D Robot Control + FluidNC Robot Control