v1.0.141

CHANGELOG.txt

@@ -1,3 +1,4 @@
+v1.0.141: Fix Bug that prevented Jog, fixed bug that disabled homing for Smoothie
 v1.0.140: Fix Jog/Checksize to still move in mm after G20
 v1.0.138: Changed size of MiniMill overlay, made 3D viewer the default tab
 v1.0.137: Added Confirmation Dialogs to the Grbl Settings reset buttons

app/index.html

@@ -251,7 +251,7 @@
                 </ul>
               </div>
 
-              <button id="homeBtn" class="ribbon-button" onclick="sendGcode('$H')">
+              <button id="homeBtn" class="ribbon-button">
                 <span class="icon">
                   <i class="fas fa-home"></i>
                 </span>

app/js/grblsettings.js

@@ -50,7 +50,7 @@ function grblSettings(data) {
   // $('#grblFirmwareBtn').removeAttr('disabled');
   $('#grblSettings').show()
 
-  if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
+  if (grblParams['$22'] == 1) {
     $('#gotozeroMPos').removeClass('disabled')
     $('#homeBtn').attr('disabled', false)
     $('#gotoXzeroMpos').removeClass('disabled')

app/js/jog.js

@@ -175,12 +175,20 @@ $(document).ready(function() {
     jog('Z', jogdist, feedrate);
   })
 
+  $('#homeBtn').on('click', function(ev) {
+    if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
+      sendGcode('$H')
+    } else if (laststatus != undefined && laststatus.machine.firmware.type == 'smoothie') {
+      sendGcode('G28')
+    }
+  })
+
   $('#chkSize').on('click', function() {
     var bbox2 = new THREE.Box3().setFromObject(object);
     console.log('bbox for Draw Bounding Box: ' + object + ' Min X: ', (bbox2.min.x), '  Max X:', (bbox2.max.x), 'Min Y: ', (bbox2.min.y), '  Max Y:', (bbox2.max.y));
     var feedrate = $('#jograte').val();
     if (laststatus.machine.firmware.type === 'grbl') {
-      if object.userData.inch {
+      if (object.userData.inch) {
         var moves = `
         $J=G90G20X` + (bbox2.min.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
         $J=G90G20X` + (bbox2.max.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n

app/js/ui.js

@@ -116,11 +116,14 @@ function setControlBar(val, status) {
     $('#stopBtn').hide().attr('disabled', true);
     $('#toolBtn').hide().attr('disabled', true);
     $('#toolBtn2').hide().attr('disabled', true);
-    if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
+    if (laststatus.machine.firmware.type == 'grbl') {
+      if (grblParams['$22'] == 1) {
         $('#homeBtn').hide().attr('disabled', true);
       } else {
         $('#homeBtn').hide().attr('disabled', true);
       }
+    }
+
     $('.estop').hide()
   } else if (val == 1 || val == 2) { // Connected, but not Playing yet
     if (typeof ace !== 'undefined') {
@@ -134,11 +137,13 @@ function setControlBar(val, status) {
     $('#stopBtn').show().attr('disabled', true);
     $('#toolBtn').show().attr('disabled', false);
     $('#toolBtn2').show().attr('disabled', false);
-    if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
+    if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
+      if (grblParams['$22'] == 1) {
         $('#homeBtn').show().attr('disabled', false);
       } else {
         $('#homeBtn').show().attr('disabled', true);
       }
+    }
     $('.estop').show()
   } else if (val == 3) { // Busy Streaming GCODE
     $('#runBtn').hide().attr('disabled', true);
@@ -148,11 +153,13 @@ function setControlBar(val, status) {
     $('#stopBtn').show().attr('disabled', false);
     $('#toolBtn').show().attr('disabled', false);
     $('#toolBtn2').show().attr('disabled', false);
-    if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
+    if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
+      if (grblParams['$22'] == 1) {
         $('#homeBtn').show().attr('disabled', true);
       } else {
         $('#homeBtn').show().attr('disabled', true);
       }
+    }
     $('.estop').show()
   } else if (val == 4) { // Paused
     $('#runBtn').hide().attr('disabled', true);
@@ -162,11 +169,13 @@ function setControlBar(val, status) {
     $('#stopBtn').show().attr('disabled', false);
     $('#toolBtn').show().attr('disabled', false);
     $('#toolBtn2').show().attr('disabled', false);
-    if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
+    if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
+      if (grblParams['$22'] == 1) {
         $('#homeBtn').show().attr('disabled', true);
       } else {
         $('#homeBtn').show().attr('disabled', true);
       }
+    }
     $('.estop').show()
   } else if (val == 5) { // Alarm State
     $('#runBtn').show().attr('disabled', true);
@@ -176,11 +185,13 @@ function setControlBar(val, status) {
     $('#stopBtn').show().attr('disabled', false);
     $('#toolBtn').show().attr('disabled', true);
     $('#toolBtn2').show().attr('disabled', true);
-    if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
+    if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
+      if (grblParams['$22'] == 1) {
         $('#homeBtn').show().attr('disabled', true);
       } else {
         $('#homeBtn').show().attr('disabled', true);
       }
+    }
     $('.estop').show()
   } else if (val == 6) { // Firmware Upgrade State
     $('#runBtn').hide().attr('disabled', true);
@@ -190,11 +201,13 @@ function setControlBar(val, status) {
     $('#stopBtn').hide().attr('disabled', true);
     $('#toolBtn').hide().attr('disabled', true);
     $('#toolBtn2').hide().attr('disabled', true);
-    if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
+    if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
+      if (grblParams['$22'] == 1) {
         $('#homeBtn').hide().attr('disabled', true);
       } else {
         $('#homeBtn').show().attr('disabled', true);
       }
+    }
     $('.estop').hide()
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "license": "AGPL-3.0",
   "description": "Machine Interface Driver for OpenBuilds",
   "author": "github.com/openbuilds <webmaster@openbuilds.com>",