Command - Weitergeben
This commit is contained in:
@@ -25,6 +25,12 @@ class FluidNCClient extends EventEmitter {
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.ws.on("message", (msg) => {
|
this.ws.on("message", (msg) => {
|
||||||
|
// console.log("[FluidNC] Received from FluidNC:", msg.toString());
|
||||||
|
// ExampleMessgae: <Idle|MPos:0.000,0.000,0.000|FS:0,0|Pn:P|WCO:0.000,0.000,-70.000>
|
||||||
|
// <Idle|MPos:0.000,0.000,0.000|FS:0,0|Pn:P>
|
||||||
|
if (!msg.toString().includes("<Idle|MPos:") && msg.toString() != "ok") {
|
||||||
|
console.log("[FluidNC] Received from FluidNC:", msg.toString());
|
||||||
|
}
|
||||||
this.emit("message", msg.toString());
|
this.emit("message", msg.toString());
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -60,7 +66,8 @@ class FluidNCClient extends EventEmitter {
|
|||||||
// $J= um den Befehl als Jog zu kennzeichnen
|
// $J= um den Befehl als Jog zu kennzeichnen
|
||||||
// G91 für relative Bewegungen (G90 für absolute)
|
// G91 für relative Bewegungen (G90 für absolute)
|
||||||
// G1 Linearbewegung
|
// G1 Linearbewegung
|
||||||
const cmd = relative? `$J=G91 G1 ${axis}${value} F2000\r\n`: `$J=G90 G1 ${axis}${value} F2000\r\n`;
|
//const cmd = relative? `$J=G91 G1 ${axis}${value} F2000\r\n`: `$J=G90 G1 ${axis}${value} F2000\r\n`;
|
||||||
|
const cmd = relative? `G91 G1 ${axis}${value} F2000\r\n`: `G90 G1 ${axis}${value} F2000\r\n`;
|
||||||
console.log("[FluidNC] Jog Command:", cmd);
|
console.log("[FluidNC] Jog Command:", cmd);
|
||||||
this.sendLine(cmd);
|
this.sendLine(cmd);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,10 +66,10 @@ fluid.onMessage((msg) => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Status polling ("?" every 50ms)
|
// Status polling ("?" every 1000ms)
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
fluid.requestStatus();
|
fluid.requestStatus();
|
||||||
}, 50);
|
}, 3000);
|
||||||
|
|
||||||
server.listen(config.server.port, () => {
|
server.listen(config.server.port, () => {
|
||||||
console.log("[Server] Running at:");
|
console.log("[Server] Running at:");
|
||||||
|
|||||||
@@ -175,6 +175,7 @@
|
|||||||
ws.send(JSON.stringify({
|
ws.send(JSON.stringify({
|
||||||
type: "jog",
|
type: "jog",
|
||||||
axis: axis,
|
axis: axis,
|
||||||
|
relative: true,
|
||||||
value: value
|
value: value
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user