From 006bd77c2b0d53000b118f3d4c79de60548a22f1 Mon Sep 17 00:00:00 2001 From: openbuilds-engineer Date: Thu, 11 Feb 2021 23:11:43 +0200 Subject: [PATCH] v1.0.284 --- CHANGELOG.txt | 3 ++- app/js/websocket.js | 1 + index.js | 3 --- package.json | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index dda65dd..729b59e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,5 @@ -v1.0.283: Fixed realtime feedrate indicator +v1.0.284: Fixed bug related to Door that was affecting Probing +v1.0.283: Fixed realtime feedrate indicator, improved Door handling v1.0.282: Improved logging messages for Interface Firmware flashing tool, Fixed bug with non-standard Grbl Firmwares that have Variable Speed disabled v1.0.281: Added "Restore Backup" button for Grbl Settings, Fixed jog increment for mm after switching between in/mm v1.0.280: Socket.IO Bug fixed diff --git a/app/js/websocket.js b/app/js/websocket.js index c9c9707..d088f8e 100644 --- a/app/js/websocket.js +++ b/app/js/websocket.js @@ -247,6 +247,7 @@ function initSocket() { } if (data.jobCompletedMsg && data.jobCompletedMsg.length > 0) { if (data.jobStartTime) { + var runTime = data.jobEndTime - data.jobStartTime; $("#completeMsgDiv").html("Job completed in " + msToTime(runTime) + "
" + data.jobCompletedMsg); } else { $("#completeMsgDiv").html(data.jobCompletedMsg); diff --git a/index.js b/index.js index f574ba0..109678f 100644 --- a/index.js +++ b/index.js @@ -2122,9 +2122,6 @@ function parseFeedback(data) { if (pins.includes('D')) { // pause pause(); - - } else { - unpause(); } if (pins.includes('R')) { diff --git a/package.json b/package.json index 2b77101..7c408d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.283", + "version": "1.0.284", "license": "AGPL-3.0", "description": "OpenBuildsCONTROL CNC Machine Interface Software", "author": "github.com/openbuilds ",