v1.0.301

CHANGELOG.txt

@@ -1,3 +1,4 @@
+v1.0.301: Bugfix: DRO Set position for Y/Z (Bug #211), Bugfix: Cleanup lastJobStartTime on cancel (Issue #210), Fixed Door generates feedhold message (Bug #191)
 v1.0.299/300: Updated GitHubActions to only build on tagged releases, Updated Authenticode Certificates, Updated SSL Certificates, Fixed layout of Job Log window, Fixed Mobile Jog Widget bug, Added Jog Rate slider to Mobile Jog, Changed statusbar timer to show DONE:time when job is complete
 v1.0.298: Added Keyboard shortcuts for in/decrease Jog Speed
 v1.0.297: Changed package.json for GitHub Actions / Electron Updater bug

app/index.html

@@ -131,7 +131,7 @@
                   </span>
                   <span class="caption">Unlock<br>Alarm</span>
                 </button>
-                <button class="ribbon-button" onclick="socket.emit('stop', { stop: false, jog: false, abort: true})">
+                <button class="ribbon-button" onclick="socket.emit('stop', { stop: false, jog: false, abort: true});">
                   <span class="icon">
                     <span class="fa-layers fa-fw">
                       <i class="fas fa-circle fg-red" data-fa-transform="grow-8"></i>
@@ -239,7 +239,7 @@
                   </span>
                   <span class="caption">Pause<br>Job</span>
                 </button>
-                <button id="stopBtn" class="ribbon-button" onclick="socket.emit('stop', { stop: true, jog: false, abort: false})">
+                <button id="stopBtn" class="ribbon-button" onclick="socket.emit('stop', { stop: true, jog: false, abort: false});">
                   <span class="icon">
                     <i class="fas fa-stop"></i>
                   </span>
@@ -379,7 +379,7 @@
                   </span>
                   <span class="caption">Unlock<br>Alarm</span>
                 </button>
-                <button class="ribbon-button" onclick="socket.emit('stop', { stop: false, jog: false, abort: true})">
+                <button class="ribbon-button" onclick="socket.emit('stop', { stop: false, jog: false, abort: true});">
                   <span class="icon">
                     <span class="fa-layers fa-fw">
                       <i class="fas fa-circle fg-red" data-fa-transform="grow-8"></i>

app/js/jog.js

@@ -224,13 +224,13 @@ $(document).ready(function() {
       $(this).removeAttr("disabled");
       if (unit == "mm") {
         if (e.shiftKey) {
-          sendGcode("G10 P0 L20 Y" + $("#yPosInput").val());
+          sendGcode("G21\nG10 P0 L20 Y" + $("#yPosInput").val());
         } else {
           sendGcode("$J=G90 G21 Y" + $("#yPosInput").val() + " F" + jogRateY);
         }
       } else if (unit == "in") {
         if (e.shiftKey) {
-          sendGcode("G10 P0 L20 Y" + ($("#yPosInput").val() * 25.4));
+          sendGcode("G21\nG10 P0 L20 Y" + ($("#yPosInput").val() * 25.4));
         } else {
           sendGcode("$J=G90 G20 Y" + $("#yPosInput").val() + " F" + jogRateY);
         }
@@ -264,13 +264,13 @@ $(document).ready(function() {
       $(this).removeAttr("disabled");
       if (unit == "mm") {
         if (e.shiftKey) {
-          sendGcode("G10 P0 L20 Z" + $("#zPosInput").val());
+          sendGcode("G21\nG10 P0 L20 Z" + $("#zPosInput").val());
         } else {
           sendGcode("$J=G90 G21 Z" + $("#zPosInput").val() + " F" + jogRateZ);
         }
       } else if (unit == "in") {
         if (e.shiftKey) {
-          sendGcode("G10 P0 L20 Z" + ($("#zPosInput").val() * 25.4));
+          sendGcode("G21\nG10 P0 L20 Z" + ($("#zPosInput").val() * 25.4));
         } else {
           sendGcode("$J=G90 G20 Z" + $("#zPosInput").val() + " F" + jogRateZ);
         }

app/js/websocket.js

@@ -340,7 +340,9 @@ function initSocket() {
         if (object.userData !== 'undefined' && object.userData && object.userData.linePoints.length > 2) {
           var timeremain = object.userData.totalTime;
           if (!isNaN(timeremain)) {
-            $('#timeRemaining').html(timeConvert((new Date().getTime() - lastJobStartTime) / 1000 / 60) + " / " + timeConvert(timeremain));
+            if (lastJobStartTime) {
+              $('#timeRemaining').html(timeConvert((new Date().getTime() - lastJobStartTime) / 1000 / 60) + " / " + timeConvert(timeremain));
+            }
           }
         }
 

index.js

@@ -2149,7 +2149,7 @@ function parseFeedback(data) {
     var pins = pinsdata[0].split('')
     status.machine.inputs = pins;
     if (!_.isEqual(pins, oldpinslist)) {
-      if (pins.includes('H')) {
+      if (pins.includes('H') && !pins.includes('D')) {
         // pause
         pause();
         var output = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.300",
+  "version": "1.0.301",
   "license": "AGPL-3.0",
   "description": "OpenBuildsCONTROL CNC Machine Interface Software",
   "author": "github.com/openbuilds <support@openbuilds.com>",