From 930bd7e7c2423d39ed3c4f88954397cd0d5a4cfd Mon Sep 17 00:00:00 2001
From: openbuilds-engineer
Date: Thu, 2 Aug 2018 22:17:56 +0200
Subject: [PATCH] Test of DRO during Job
---
app/js/websocket.js | 1 +
index.js | 3 ++-
package.json | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/js/websocket.js b/app/js/websocket.js
index 9314441..6dc2e39 100644
--- a/app/js/websocket.js
+++ b/app/js/websocket.js
@@ -182,6 +182,7 @@ function initSocket() {
});
socket.on('status', function(status) {
+ console.log(status.machine.position.work.x)
if (nostatusyet) {
$('#windowtitle').html("OpenBuids Machine Driver v" + status.driver.version)
}
diff --git a/index.js b/index.js
index e47d477..239f2a0 100644
--- a/index.js
+++ b/index.js
@@ -825,7 +825,7 @@ io.on("connection", function(socket) {
// Start interval for status queries
statusLoop = setInterval(function() {
if (status.comms.connectionStatus > 0) {
- if (!status.comms.sduploading && !status.comms.blocked) {
+ if (!status.comms.sduploading) {
machineSend("?");
}
}
@@ -1030,6 +1030,7 @@ io.on("connection", function(socket) {
// Got statusReport (Grbl & Smoothieware)
// statusfeedback func
parseFeedback(data)
+ // console.log(data)
} else if (data.indexOf("ok") === 0) { // Got an OK so we are clear to send
// console.log("OK FOUND")
if (status.machine.firmware.type === "grbl") {
diff --git a/package.json b/package.json
index bf4a7cc..261b076 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "OpenBuildsMachineDriver",
- "version": "1.0.37",
+ "version": "1.0.38",
"license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds ",